[pkgsrc/pkgsrc-2017Q4]: pkgsrc/devel/gnustep-objc Pullup ticket #5664 - reque...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0732a28b16ae
branches:  pkgsrc-2017Q4
changeset: 373090:0732a28b16ae
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon Jan 01 13:41:50 2018 +0000

description:
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

diffstat:

 devel/gnustep-objc/Makefile      |  4 ++--
 devel/gnustep-objc/buildlink3.mk |  6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 5f2fec0e8cc2 -r 0732a28b16ae devel/gnustep-objc/Makefile
--- a/devel/gnustep-objc/Makefile       Sat Dec 30 00:10:35 2017 +0000
+++ b/devel/gnustep-objc/Makefile       Mon Jan 01 13:41:50 2018 +0000
@@ -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
diff -r 5f2fec0e8cc2 -r 0732a28b16ae devel/gnustep-objc/buildlink3.mk
--- a/devel/gnustep-objc/buildlink3.mk  Sat Dec 30 00:10:35 2017 +0000
+++ b/devel/gnustep-objc/buildlink3.mk  Mon Jan 01 13:41:50 2018 +0000
@@ -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_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