diff --git a/core/bison/build b/core/bison/build index 4e807e29..80fda47d 100755 --- a/core/bison/build +++ b/core/bison/build @@ -1,13 +1,13 @@ #!/bin/sh -e -./configure \ +MAKE=gmake ./configure \ --prefix=/usr \ --disable-nls \ --without-libtextstyle-prefix -make +gmake -make DESTDIR="$1" \ +gmake DESTDIR="$1" \ install-libLIBRARIES \ install-binPROGRAMS \ install-nodist_binSCRIPTS \ diff --git a/core/git/build b/core/git/build index 7e948520..6168c517 100755 --- a/core/git/build +++ b/core/git/build @@ -23,7 +23,7 @@ EOF ac_cv_snprintf_returns_bogus=no \ ac_cv_fread_reads_directories=yes -make LIBS="$(curl-config --static-libs) libgit.a reftable/libreftable.a xdiff/lib.a -lz" -make DESTDIR="$1" install +gmake LIBS="$(curl-config --static-libs) libgit.a reftable/libreftable.a xdiff/lib.a -lz" +gmake DESTDIR="$1" install cp -Rf man "$1/usr/share/man" diff --git a/core/make/build b/core/make/build index dcb643b3..7baa4cc8 100755 --- a/core/make/build +++ b/core/make/build @@ -1,10 +1,12 @@ #!/bin/sh -e -export LDFLAGS="$LDFLAGS -static" +export DESTDIR="$1" +export PREFIX=/usr -./configure \ - --prefix=/usr \ - --disable-nls +cc -o make *.c +./make +./make test -make -make DESTDIR="$1" install +mkdir -p "$1/usr/bin" +cp -f make "$1/usr/bin/pdpmake" +ln -s pdpmake "$1/usr/bin/make" diff --git a/core/make/checksums b/core/make/checksums index a4c1387b..710887e0 100644 --- a/core/make/checksums +++ b/core/make/checksums @@ -1 +1 @@ -a7d8aee97b7e9a525ef561afa84eea0d929f246e3aafa420231c0602151cf9eb03 +27c9b61b5086e806fc33484a40a2fa2c4eeb21d0cc1eee10318d8d187daa9d6032 diff --git a/core/make/sources b/core/make/sources index ebbd0bc3..3a6f057c 100644 --- a/core/make/sources +++ b/core/make/sources @@ -1 +1 @@ -https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz +https://frippery.org/make/pdpmake-1.4.1.tgz diff --git a/core/make/version b/core/make/version index 2cb41e4b..e187c17e 100644 --- a/core/make/version +++ b/core/make/version @@ -1 +1 @@ -4.4.1 1 +1.4.1 1 diff --git a/core/make/README b/extra/gmake/README similarity index 100% rename from core/make/README rename to extra/gmake/README diff --git a/extra/gmake/build b/extra/gmake/build new file mode 100755 index 00000000..084e7f5b --- /dev/null +++ b/extra/gmake/build @@ -0,0 +1,13 @@ +#!/bin/sh -e + +export LDFLAGS="$LDFLAGS -static" + +./configure \ + --prefix=/usr \ + --disable-nls + +make +make DESTDIR="$1" install +mv "$1/usr/bin/make" "$1/usr/bin/gmake" +mv "$1/usr/share/man/man1/make.1" "$1/usr/share/man/man1/gmake.1" +ln -s gmake "$1/usr/bin/make" diff --git a/extra/gmake/checksums b/extra/gmake/checksums new file mode 100644 index 00000000..a4c1387b --- /dev/null +++ b/extra/gmake/checksums @@ -0,0 +1 @@ +a7d8aee97b7e9a525ef561afa84eea0d929f246e3aafa420231c0602151cf9eb03 diff --git a/extra/gmake/sources b/extra/gmake/sources new file mode 100644 index 00000000..ebbd0bc3 --- /dev/null +++ b/extra/gmake/sources @@ -0,0 +1 @@ +https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz diff --git a/extra/gmake/version b/extra/gmake/version new file mode 100644 index 00000000..2cb41e4b --- /dev/null +++ b/extra/gmake/version @@ -0,0 +1 @@ +4.4.1 1 diff --git a/extra/python/build b/extra/python/build index 09ceaf97..3be93b2f 100755 --- a/extra/python/build +++ b/extra/python/build @@ -22,8 +22,8 @@ done --with-system-ffi \ --with-ensurepip=yes -make EXTRA_CFLAGS="$CFLAGS -DTHREAD_STACK_SIZE=0x100000" -make DESTDIR="$1" install +gmake EXTRA_CFLAGS="$CFLAGS -DTHREAD_STACK_SIZE=0x100000" +gmake DESTDIR="$1" install ln -s python3 "$1/usr/bin/python" ln -s pip3 "$1/usr/bin/pip" diff --git a/extra/python/depends b/extra/python/depends index 82849f0a..886c4cab 100644 --- a/extra/python/depends +++ b/extra/python/depends @@ -1,5 +1,6 @@ bzip2 expat +gmake libffi openssl sqlite