diff options
Diffstat (limited to 'dev-util/plan9port/files')
4 files changed, 13 insertions, 24 deletions
diff --git a/dev-util/plan9port/files/plan9port-builderr.patch b/dev-util/plan9port/files/plan9port-builderr.patch index 266f10c4b9d5..b1f3d1275ce8 100644 --- a/dev-util/plan9port/files/plan9port-builderr.patch +++ b/dev-util/plan9port/files/plan9port-builderr.patch @@ -4,15 +4,15 @@ By default, the plan9port INSTALL script doesn't report build error, which can result in a mostly broken build begin installed. --- a/INSTALL +++ b/INSTALL -@@ -41,7 +41,6 @@ echo " " - echo "* Resetting $PLAN9/config" - rm -f config +@@ -65,7 +65,6 @@ + ;; + esac -( - echo "* Compiler version:" - 9c -v 2>&1 | grep -v 'Configured with:' | grep -i version | sed 's/^/ /' - -@@ -134,7 +133,7 @@ if $dobuild; then + if [ `uname` = SunOS ]; then + # On Solaris x86, uname -p cannot be trusted. + echo "* Running on Solaris: checking architecture..." +@@ -159,7 +158,7 @@ echo "* Warning: not all binaries built successfully." fi echo "* Installing everything in $PLAN9/bin..." @@ -21,7 +21,7 @@ which can result in a mostly broken build begin installed. if [ ! -x $PLAN9/bin/cleanname -o ! -x $PLAN9/bin/acme -o ! -x $PLAN9/bin/sam ]; then echo " " echo "* Warning: not all binaries built successfully." -@@ -182,5 +181,4 @@ if $doinstall; then +@@ -211,5 +210,4 @@ echo " PLAN9=$PLAN9 export PLAN9" echo ' PATH=$PATH:$PLAN9/bin export PATH' fi diff --git a/dev-util/plan9port/files/plan9port-cflags.patch b/dev-util/plan9port/files/plan9port-cflags.patch index c2d2ed6defe5..74bd60518d08 100644 --- a/dev-util/plan9port/files/plan9port-cflags.patch +++ b/dev-util/plan9port/files/plan9port-cflags.patch @@ -5,10 +5,10 @@ This allows the plan9port build to inherit cflags from the environment. (This patch must be applied after plan9port-noexecstack.patch) --- a/src/mkhdr +++ b/src/mkhdr -@@ -28,8 +28,6 @@ LD=9l +@@ -11,8 +11,6 @@ + LD=9l AS=9a AR=9ar - INSTALL=install -CFLAGS= -LDFLAGS= AFLAGS=--noexecstack diff --git a/dev-util/plan9port/files/plan9port-freebsd-10.patch b/dev-util/plan9port/files/plan9port-freebsd-10.patch deleted file mode 100644 index cc46dc6f4509..000000000000 --- a/dev-util/plan9port/files/plan9port-freebsd-10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/9l 2015-12-09 19:12:50.000000000 +0000
-+++ b/bin/9l 2015-12-09 19:13:00.000000000 +0000
-@@ -19,7 +19,7 @@ case "$tag" in
- 5.2.*)
- extralibs="$extralibs -lkse"
- ;;
-- [5-9].*)
-+ [5-9].*|10.*)
- extralibs="$extralibs -lpthread"
- ;;
- esac
diff --git a/dev-util/plan9port/files/plan9port-noexecstack.patch b/dev-util/plan9port/files/plan9port-noexecstack.patch index fb4f19f21fc5..aff60d07a989 100644 --- a/dev-util/plan9port/files/plan9port-noexecstack.patch +++ b/dev-util/plan9port/files/plan9port-noexecstack.patch @@ -22,7 +22,7 @@ Patch by Andy Spencer test -f $PLAN9/config && . $PLAN9/config aflags="" -@@ -17,5 +12,16 @@ Darwin-*x86_64*) +@@ -17,5 +12,16 @@ ;; esac @@ -43,8 +43,8 @@ Patch by Andy Spencer +exec as $aflags $opts -o $dst $src --- a/src/mkhdr +++ b/src/mkhdr -@@ -30,7 +30,7 @@ AR=9ar - INSTALL=install +@@ -13,7 +13,7 @@ + AR=9ar CFLAGS= LDFLAGS= -AFLAGS= |