diff options
Diffstat (limited to 'devel/libfastcommon/files/patch-make.sh')
| -rw-r--r-- | devel/libfastcommon/files/patch-make.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/devel/libfastcommon/files/patch-make.sh b/devel/libfastcommon/files/patch-make.sh index d7ec779cb34d..c441eca8b52c 100644 --- a/devel/libfastcommon/files/patch-make.sh +++ b/devel/libfastcommon/files/patch-make.sh @@ -1,6 +1,6 @@ ---- make.sh.orig 2016-09-08 07:44:31 UTC +--- make.sh.orig 2019-12-25 12:35:44 UTC +++ make.sh -@@ -1,55 +1,15 @@ +@@ -1,57 +1,16 @@ -tmp_src_filename=fast_check_bits.c -cat <<EOF > $tmp_src_filename -#include <stdio.h> @@ -37,10 +37,13 @@ - - count=`$EXPR $count + 1` -done +- +-/bin/rm -f a.out $tmp_src_filename +unamep=$(/usr/bin/uname -p) --/bin/rm -f a.out $tmp_src_filename +-TARGET_PREFIX=$DESTDIR/usr -if [ "$int_bytes" -eq 8 ]; then ++TARGET_PREFIX=$DESTDIR$PREFIX +if [ "$unamep" = "amd64" -o "$unamep" = "x86_64" ]; then OS_BITS=64 - LIB_VERSION=lib64 @@ -61,7 +64,7 @@ DEBUG_FLAG=0 CFLAGS='-Wall -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE' -@@ -67,12 +27,9 @@ HAVE_USER_H=0 +@@ -69,14 +28,9 @@ HAVE_USER_H=0 if [ "$uname" = "Linux" ]; then OS_NAME=OS_LINUX IOEVENT_USE=IOEVENT_USE_EPOLL @@ -71,16 +74,18 @@ IOEVENT_USE=IOEVENT_USE_KQUEUE - if [ "$uname" = "Darwin" ]; then - CFLAGS="$CFLAGS -DDARWIN" +- TARGET_PREFIX=$TARGET_PREFIX/local +- LIB_VERSION=lib - fi if [ -f /usr/include/sys/vmmeter.h ]; then HAVE_VMMETER_H=1 -@@ -138,7 +95,7 @@ sed_replace() +@@ -142,7 +96,7 @@ sed_replace() { sed_cmd=$1 filename=$2 - if [ "$uname" = "FreeBSD" ] || [ "$uname" = "Darwin" ]; then -+ if [ "$uname" = "FreeBSD" -o "$uname" = "DragonFly" ]; then ++ if [ "$uname" = "FreeBSD" -o "$name" = "DragonFly" ]; then sed -i "" "$sed_cmd" $filename else sed -i "$sed_cmd" $filename |