diff --git a/base/diffutils/diffutils.SMBuild b/base/diffutils/diffutils.SMBuild index 2d2f13a..fca976a 100755 --- a/base/diffutils/diffutils.SMBuild +++ b/base/diffutils/diffutils.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=diffutils version=3.6 -build=2sml +build=1sml homepage="https://www.gnu.org/software/diffutils/" download="https://ftp.gnu.org/gnu/diffutils/diffutils-$version.tar.xz" desc="Utilities to find and apply differences between files" @@ -14,17 +14,13 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - - for i in tests gnulib-tests doc ; do - printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > "$i"/Makefile.in - done } build() { - CPPFLAGS="$($srcdir/gnulibfix lib)" \ LDFLAGS="-static" \ ./configure \ - --prefix= + --prefix=/usr \ + --bindir=/bin make make install DESTDIR=$pkg diff --git a/base/diffutils/gnulibfix b/base/diffutils/gnulibfix deleted file mode 100755 index 72b30fa..0000000 --- a/base/diffutils/gnulibfix +++ /dev/null @@ -1,185 +0,0 @@ -#!/bin/sh -empty_file() { - rm -f "$1" - touch "$1" -} - -dir="$1" -# fix files breaking the build entirely -for i in freadahead.c fseterr.c ; do empty_file "$dir"/$i ; done -echo "void close_stdin(void) {}" > "$dir"/closein.c - -# fix stuff trying to reimplement libc -culprits=`cat << EOF -accept4 -acosl -alloca -alphasort -asinl -asprintf -atanl -atexit -atoll -bcopy -btowc -chown -closedir -cosl -dirfd -dprintf -dup2 -dup3 -_Exit -expl -fchdir -fchown-stub -fdatasync -fdopendir -ffs -flock -fnmatch -forkpty -fpending -fprintf -freeaddrinfo -fsync -ftell -ftruncate -futimens -gai_strerror -getaddrinfo -getdelim -getdtablesize -getgroups -gethostname -getline -getlogin -getlogin_r -getnameinfo -getpagesize -getpass -getsubopt -gettimeofday -getusershell -gmtime_r -grantpt -imaxabs -imaxdiv -inet_ntop -inet_pton -isblank -iswblank -lchmod -lchown -ldexp -ldexpl -link -linkat -logl -mbrlen -mbrtowc -mbsinit -memmove -mempcpy -mkdtemp -mkfifo -mkfifoat -mknod -mknodat -mkstemp -mktime -nanosleep -nl_langinfo -open -openat -opendir -openpty -pclose -perror -pipe -pipe2 -poll -popen -pread -pselect -ptsname -pwrite -raise -readdir -readlink -renameat -rewinddir -setenv -sigaction -sigaddset -sigdelset -sigemptyset -sigfillset -sigismember -sigpending -sigprocmask -sinl -snprintf -spawnattr_destroy -spawnattr_getdefault -spawnattr_getflags -spawnattr_getpgroup -spawnattr_getsigmask -spawnattr_init -spawnattr_setdefault.c -spawnattr_setflags -spawnattr_setpgroup -spawnattr_setsigmask -spawn_faction_addclose -spawn_faction_adddup2 -spawn_faction_addopen -spawn_faction_destroy -spawn_faction_init -spawn_factions_addopen -spawn_factions_destroy -spawn_factions_init -sprintf -sqrtl -stdio-read -stdio-write -strcasecmp -strcasestr -strchrnul -strcspn -strncasecmp -strndup -strnlen -strpbrk -strsep -strsignal -strstr -strtod -strtoimax -strtol -symlink -symlinkat -tanl -tcgetsid -timegm -time_r -times -tmpfile -uname -unlockpt -unsetenv -usleep -vasprintf -vdprintf -waitpid -wcrtomb -wctob -EOF -` -#fixme check fsusage -flags="-Drpl_tzset=tzset -Drpl_localtime=localtime -Dgnu_fnmatch=fnmatch \ - -Dposix_fnmatch=fnmatch -Drpl_gmtime=gmtime" -for i in $culprits ; do - empty_file "$dir"/$i.c - flags="$flags -Drpl_$i=$i" -done -printf "%s\n" "$flags" diff --git a/base/dosfstools/dosfstools.SMBuild b/base/dosfstools/dosfstools.SMBuild index 5c73501..e917b7a 100755 --- a/base/dosfstools/dosfstools.SMBuild +++ b/base/dosfstools/dosfstools.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=dosfstools version=4.1 -build=2sml +build=1sml homepage="https://github.com/dosfstools/dosfstools" download="https://github.com/dosfstools/dosfstools/releases/download/v$version/dosfstools-$version.tar.gz" desc="Tools for working with FAT filesystems" @@ -17,11 +17,9 @@ prepbuilddir() { } build() { - LDFLAGS="-static" \ ./configure \ - --prefix= \ - --sbindir=/bin \ - --enable-compat-symlinks + --prefix=/usr \ + --sbindir=/bin make make install DESTDIR=$pkg diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild index 8efc8ed..66f8065 100755 --- a/base/file/file.SMBuild +++ b/base/file/file.SMBuild @@ -1,7 +1,7 @@ # Maintainer: PktSurf app=file version=5.44 -build=4sml +build=1sml homepage="https://www.darwinsys.com/file/" download="http://astron.com/pub/file/file-$version.tar.gz" desc="Utility to determine file types" @@ -14,16 +14,14 @@ prepbuilddir() { tar xf $srcdir/$app-$version.tar.?z* cd $app-$version fixbuilddirpermissions - - #applypatch $srcdir/file.etc.file.diff - #applypatch $srcdir/file.short.diff } build() { # linking against libseccomp causes weird "Bad system call" issues CFLAGS+=" --std=c99" \ ./configure \ - --prefix= \ + --prefix=/usr \ + --bindir=/bin \ --datadir=/etc \ --enable-fsect-man5 \ --disable-libseccomp @@ -49,4 +47,4 @@ build() { sha512sums=" aafc7bb8a84d64ec77b6e325868ce6149dea3fb3cb46868892c7c872dfeb7f56180cd231f2eecba4d256c7dd4936a6886de56b1ef3d69874ce798c1e49b91c05 file-5.44.tar.lz -" \ No newline at end of file +" diff --git a/base/i2c-tools/i2c-tools.SMBuild b/base/i2c-tools/i2c-tools.SMBuild index e79ef1f..bf1c414 100755 --- a/base/i2c-tools/i2c-tools.SMBuild +++ b/base/i2c-tools/i2c-tools.SMBuild @@ -18,7 +18,7 @@ prepbuilddir() { build() { make - make install PREFIX="/" mandir="/share/man" DESTDIR="$pkg" sbindir="/bin" + make install PREFIX="/usr" mandir="/usr/share/man" DESTDIR="$pkg" bindir="/bin" sbindir="/bin" cp COPYING* $pkgdocs/ diff --git a/base/libksba/libksba.SMBuild b/base/libksba/libksba.SMBuild index 89f262c..dc85eb1 100755 --- a/base/libksba/libksba.SMBuild +++ b/base/libksba/libksba.SMBuild @@ -17,7 +17,8 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ + --prefix=/usr \ + --bindir=/bin \ --enable-shared=yes \ --enable-static=no diff --git a/base/libminizip/libminizip.SMBuild b/base/libminizip/libminizip.SMBuild index bd2fa3d..1f762ca 100755 --- a/base/libminizip/libminizip.SMBuild +++ b/base/libminizip/libminizip.SMBuild @@ -23,7 +23,7 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ + --prefix=/usr \ --disable-static make diff --git a/base/libmms/libmms.SMBuild b/base/libmms/libmms.SMBuild index 11b5117..1772395 100755 --- a/base/libmms/libmms.SMBuild +++ b/base/libmms/libmms.SMBuild @@ -17,7 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ + --prefix=/usr \ --disable-static make diff --git a/base/libplist/libplist.SMBuild b/base/libplist/libplist.SMBuild index e23ed58..15ddfbc 100755 --- a/base/libplist/libplist.SMBuild +++ b/base/libplist/libplist.SMBuild @@ -20,7 +20,8 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ + --prefix=/usr \ + --bindir=/bin \ --disable-static make diff --git a/base/libpthread-stubs/libpthread-stubs.SMBuild b/base/libpthread-stubs/libpthread-stubs.SMBuild index b41d3db..77cd621 100755 --- a/base/libpthread-stubs/libpthread-stubs.SMBuild +++ b/base/libpthread-stubs/libpthread-stubs.SMBuild @@ -17,8 +17,7 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ - $builddist + --prefix=/usr make make install DESTDIR=$pkg diff --git a/base/libshout/libshout.SMBuild b/base/libshout/libshout.SMBuild index 78ed8ff..ccb80c3 100755 --- a/base/libshout/libshout.SMBuild +++ b/base/libshout/libshout.SMBuild @@ -18,9 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix= \ - --disable-static \ - $builddist + --prefix=/usr \ + --disable-static make make install DESTDIR=$pkg diff --git a/base/yasm/yasm.SMBuild b/base/yasm/yasm.SMBuild index fd418a9..1e7fcf4 100755 --- a/base/yasm/yasm.SMBuild +++ b/base/yasm/yasm.SMBuild @@ -18,7 +18,8 @@ prepbuilddir() { build() { ./configure \ - --prefix= + --prefix=/usr \ + --bindir=/bin sed -i 's@gnu99@gnu99 -fPIC@g' Makefile