CVS commit: [pkgsrc-2017Q4] pkgsrc/devel/gnustep-objc

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Mon Jan  1 13:41:50 UTC 2018

Modified Files:
        pkgsrc/devel/gnustep-objc [pkgsrc-2017Q4]: Makefile buildlink3.mk

Log Message:
Pullup ticket #5664 - requested by he
devel/gnustep-objc: build fix

Revisions pulled up:
- devel/gnustep-objc/Makefile                                   1.31
- devel/gnustep-objc/buildlink3.mk                              1.11

-------------------------------------------------------------------
   Module Name: pkgsrc
   Committed By:        he
   Date:                Sun Dec 31 11:20:03 UTC 2017

   Modified Files:
        pkgsrc/devel/gnustep-objc: Makefile buildlink3.mk

   Log Message:
   At least on NetBSD, gnustep-objc's libobjc.so ends up with various
   _Unwind_* symbols undefined, and apparently they can come from -lgcc_s.
   Being cautious, link in -lgcc_s on NetBSD only so far.
   Bump PKGREVISION.

   To generate a diff of this commit:
   cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/gnustep-objc/Makefile
   cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/gnustep-objc/buildlink3.mk


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.6.1 pkgsrc/devel/gnustep-objc/Makefile
cvs rdiff -u -r1.10 -r1.10.48.1 pkgsrc/devel/gnustep-objc/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gnustep-objc/Makefile
diff -u pkgsrc/devel/gnustep-objc/Makefile:1.30 pkgsrc/devel/gnustep-objc/Makefile:1.30.6.1
--- pkgsrc/devel/gnustep-objc/Makefile:1.30     Tue Aug  1 17:40:10 2017
+++ pkgsrc/devel/gnustep-objc/Makefile  Mon Jan  1 13:41:50 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2017/08/01 17:40:10 wiz Exp $
+# $NetBSD: Makefile,v 1.30.6.1 2018/01/01 13:41:50 spz Exp $
 
 DISTNAME=      libobjc2-1.6.1
 PKGNAME=       ${DISTNAME:S/libobjc2/gnustep-objc/}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel gnustep
 MASTER_SITES=  http://download.gna.org/gnustep/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/devel/gnustep-objc/buildlink3.mk
diff -u pkgsrc/devel/gnustep-objc/buildlink3.mk:1.10 pkgsrc/devel/gnustep-objc/buildlink3.mk:1.10.48.1
--- pkgsrc/devel/gnustep-objc/buildlink3.mk:1.10        Mon May  7 01:53:22 2012
+++ pkgsrc/devel/gnustep-objc/buildlink3.mk     Mon Jan  1 13:41:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:22 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.10.48.1 2018/01/01 13:41:50 spz Exp $
 
 BUILDLINK_TREE+=       gnustep-objc
 
@@ -10,6 +10,10 @@ BUILDLINK_ABI_DEPENDS.gnustep-objc+= gnu
 BUILDLINK_PKGSRCDIR.gnustep-objc?=     ../../devel/gnustep-objc
 
 BUILDLINK_LDFLAGS.gnustep-objc+=       -lobjc -lpthread
+.if ${OPSYS} == "NetBSD"
+# Missing _Unwind_* symbols in gnustep objc.so, needs to come from somewhere...
+BUILDLINK_LDFLAGS.gnustep-objc+=       -lgcc_s
+.endif
 
 .include "../../devel/gnustep-make/buildlink3.mk"
 .endif # GNUSTEP_OBJC_BUILDLINK3_MK