diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-01-13 13:07:55 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2016-01-13 13:07:55 +0000 |
| commit | 34d65e774964ed282459e5cecca2f23bfe91e3b4 (patch) | |
| tree | 66b4a7748db24803fb681d82b66d11891a46bd8c /archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd | |
| parent | Fix PORTSCOUT=skipv to match tag name (diff) | |
- Base GCC cannot compile this port ("cc: XADTest2.m: Objective-C compiler
not installed on this system"); luckily, Clang is available on all recent
Tier-1 FreeBSD versions, so use it where it is not the default compiler
yet (prior to 1000024, e.g. on 9.x)
- Make the port more robust by allowing to build if LOCALBASE != /usr/local
Reported by: pkg-fallout
Notes
Notes:
svn path=/head/; revision=406039
Diffstat (limited to '')
| -rw-r--r-- | archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd b/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd index 31002d477bfa..1bb2b350c391 100644 --- a/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd +++ b/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd @@ -12,7 +12,7 @@ # Options for compilation -@@ -16,10 +13,8 @@ GNUSTEP_OPTS = -DGNUSTEP \ +@@ -16,13 +13,11 @@ GNUSTEP_OPTS = -DGNUSTEP \ -fobjc-exceptions \ -fconstant-string-class=NSConstantString @@ -22,8 +22,13 @@ -Wno-multichar \ - -g \ -D_FILE_OFFSET_BITS=64 \ - -isystem /usr/local/GNUstep/System/Library/Headers \ - -I/usr/local/include +- -isystem /usr/local/GNUstep/System/Library/Headers \ +- -I/usr/local/include ++ -isystem $(LOCALBASE)/GNUstep/System/Library/Headers \ ++ -I$(LOCALBASE)/include + + OBJC_OPTS = -std=gnu99 + @@ -42,6 +37,7 @@ LIBS = -Wl,--no-whole-archive \ -lgnustep-base \ -lz \ @@ -32,6 +37,17 @@ -licuuc \ -lobjc \ -lm +@@ -49,8 +45,8 @@ LIBS = -Wl,--no-whole-archive \ + ALL_LDFLAGS = -Wl,--whole-archive \ + -fexceptions \ + -fgnu-runtime \ +- -L/usr/local/lib \ +- -L/usr/local/GNUstep/System/Library/Libraries \ ++ -L$(LOCALBASE)/lib \ ++ -L$(LOCALBASE)/GNUstep/System/Library/Libraries \ + $(LDFLAGS) + + # Paths @@ -74,7 +70,7 @@ libXADMaster.a: $(LIBRARY_OBJS) $(AR) rcs $@ $^ |