Skip to content

Commit bcd17d6

Browse files
committed
Fixes patch error
1 parent 09f99a4 commit bcd17d6

File tree

1 file changed

+29
-17
lines changed

1 file changed

+29
-17
lines changed

make_pg_buildext_parallel.patch

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
1-
--- /usr/bin/pg_buildext 2020-11-27 12:41:34.000000000 +0300
2-
+++ /usr/bin/pg_buildext 2023-03-01 12:51:34.000000000 +0300
3-
@@ -107,11 +107,13 @@ substvars() {
4-
install() {
5-
prepare_env $1
6-
package=`echo $opt | sed -e "s:%v:$1:g"`
7-
+ procs="$(nproc)"
8-
+ mjobs="$(expr $procs + 1)"
9-
10-
mkdir -p $vtarget
11-
# if a Makefile was created by configure, use it, else the top level Makefile
12-
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
13-
- make -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 $MAKEVARS || return $?
14-
+ make -j${mjobs} -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 $MAKEVARS || return $?
15-
substvars "$1" "$package"
16-
}
17-
1+
*** usr/bin/pg_buildext Fri Dec 27 10:00:42 2024
2+
--- usr/bin/pg_buildext Fri Dec 27 10:06:25 2024
3+
***************
4+
*** 107,117 ****
5+
install() {
6+
prepare_env $1
7+
package=`echo $opt | sed -e "s:%v:$1:g"`
8+
9+
mkdir -p $vtarget
10+
# if a Makefile was created by configure, use it, else the top level Makefile
11+
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
12+
! make -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 ${MAKEVARS:-} || return $?
13+
substvars "$1" "$package"
14+
}
15+
16+
--- 107,119 ----
17+
install() {
18+
prepare_env $1
19+
package=`echo $opt | sed -e "s:%v:$1:g"`
20+
+ procs="$(nproc)"
21+
+ mjobs="$(expr $procs + 1)"
22+
23+
mkdir -p $vtarget
24+
# if a Makefile was created by configure, use it, else the top level Makefile
25+
[ -f $vtarget/Makefile ] || makefile="-f $srcdir/Makefile"
26+
! make -j${mjobs} -C $vtarget ${makefile:-} install DESTDIR="$PWD/debian/$package" PG_CONFIG="$pgc" VPATH="$srcdir" USE_PGXS=1 ${MAKEVARS:-} || return $?
27+
substvars "$1" "$package"
28+
}
29+

0 commit comments

Comments
 (0)