diff options
| -rw-r--r-- | development/bmake/bmake.SlackBuild | 35 | ||||
| -rw-r--r-- | development/bmake/bmake.info | 10 | ||||
| -rw-r--r-- | development/bmake/compilefix.diff | 14 |
3 files changed, 45 insertions, 14 deletions
diff --git a/development/bmake/bmake.SlackBuild b/development/bmake/bmake.SlackBuild index 67d469161b..f12873885e 100644 --- a/development/bmake/bmake.SlackBuild +++ b/development/bmake/bmake.SlackBuild @@ -22,14 +22,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Now maintained by B. Watson <yalhcru@gmail.com> + +# 20170214 bkw: +# - update for v20170201 +# - i486 => i586 +# - clear MAKEFLAGS from environment. setting it doesn't actually +# give you a parallel build, but it does break the 'make test' +# portion of the bmake build. + PRGNAM=bmake -VERSION=${VERSION:-20160512} +VERSION=${VERSION:-20170201} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +49,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,6 +79,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix an implicit declaration warning that *probably* doesn't hurt anything, +# but might cause problems someday. +patch -p1 < $CWD/compilefix.diff + +# The usual MAKEFLAGS=-j8 or such, will break the build. bmake interprets +# MAKEFLAGS differently from GNU make. Plus, the main part of the build +# (actually compiling bmake) isn't done by make, so MAKEFLAGS would have +# no effect. +unset MAKEFLAGS +export MAKEFLAGS + DOCS="ChangeLog README LICENSE" # The current build system does not respect a large portion of @@ -100,11 +120,8 @@ find -L $PKG \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Binary is already stripped. Only have one man page: +gzip -9 $PKG/usr/man/man1/$PRGNAM.1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION head -n70 main.c > LICENSE diff --git a/development/bmake/bmake.info b/development/bmake/bmake.info index 8727205dcb..176b4a5f3c 100644 --- a/development/bmake/bmake.info +++ b/development/bmake/bmake.info @@ -1,10 +1,10 @@ PRGNAM="bmake" -VERSION="20160512" +VERSION="20170201" HOMEPAGE="http://www.crufty.net/help/sjg/bmake.htm" -DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20160512.tar.gz" -MD5SUM="445a0f88402f40c6d5dbbaa155c42a81" +DOWNLOAD="http://www.crufty.net/ftp/pub/sjg/bmake-20170201.tar.gz" +MD5SUM="3826f07dcdb15bfb154b9a13c144c9f4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="John Vogel" -EMAIL="jvogel4@stny.rr.com" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" diff --git a/development/bmake/compilefix.diff b/development/bmake/compilefix.diff new file mode 100644 index 0000000000..e2b91821b1 --- /dev/null +++ b/development/bmake/compilefix.diff @@ -0,0 +1,14 @@ +diff -Naur bmake/make.h bmake.patched/make.h +--- bmake/make.h 2016-12-09 18:01:56.000000000 -0500 ++++ bmake.patched/make.h 2017-02-14 14:43:00.590199142 -0500 +@@ -99,6 +99,10 @@ + #include <unistd.h> + #include <sys/cdefs.h> + ++#ifndef HAVE_STRLCPY ++extern size_t strlcpy(char *dst, const char *src, size_t siz); ++#endif ++ + #ifndef FD_CLOEXEC + #define FD_CLOEXEC 1 + #endif |