diff options
| author | christos <christos@pkgsrc.org> | 2015-05-08 14:16:20 +0000 |
|---|---|---|
| committer | christos <christos@pkgsrc.org> | 2015-05-08 14:16:20 +0000 |
| commit | d1a908bd547ff23cb7085eba224425a29e7f255d (patch) | |
| tree | a0a380c0037981340ffa62e3401dcadc6c182885 | |
| parent | e3782abfe19ed8fc2cdfad1107646fd3532e9f4d (diff) | |
| download | pkgsrc-d1a908bd547ff23cb7085eba224425a29e7f255d.tar.gz | |
Avoid __weak redefinitions (from joerg)
| -rw-r--r-- | devel/gnustep-base/Makefile | 4 | ||||
| -rw-r--r-- | devel/gnustep-base/distinfo | 3 | ||||
| -rw-r--r-- | devel/gnustep-base/patches/patch-Headers_GNUstepBase_GSConfig.h.in | 17 |
3 files changed, 21 insertions, 3 deletions
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile index 3c54ef804c5..4cf696fcfd3 100644 --- a/devel/gnustep-base/Makefile +++ b/devel/gnustep-base/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.61 2015/04/06 08:17:14 adam Exp $ +# $NetBSD: Makefile,v 1.62 2015/05/08 14:16:20 christos Exp $ DISTNAME= gnustep-base-1.24.0 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= devel gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} diff --git a/devel/gnustep-base/distinfo b/devel/gnustep-base/distinfo index a2a288eb9bc..61c26ba34d4 100644 --- a/devel/gnustep-base/distinfo +++ b/devel/gnustep-base/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.28 2012/10/22 02:17:16 rh Exp $ +$NetBSD: distinfo,v 1.29 2015/05/08 14:16:20 christos Exp $ SHA1 (gnustep-base-1.24.0.tar.gz) = 4d73df5b5a594213a4c7a0ed97fc04d10c9ced69 RMD160 (gnustep-base-1.24.0.tar.gz) = 3710966cac708c5f22b1e5eaee456951791a1620 Size (gnustep-base-1.24.0.tar.gz) = 2947759 bytes +SHA1 (patch-Headers_GNUstepBase_GSConfig.h.in) = be5b7e9fd79dcb08a260caaf3092ddf7975ebbdc SHA1 (patch-aa) = f1298afa2775a45e0c9a04752ab28e5d8e898965 SHA1 (patch-ab) = 1d56de33bc1320962b763ab6b7b50c38751e3210 SHA1 (patch-ac) = 4e8e209ad202385948d0f4b0d29e5e61e01da410 diff --git a/devel/gnustep-base/patches/patch-Headers_GNUstepBase_GSConfig.h.in b/devel/gnustep-base/patches/patch-Headers_GNUstepBase_GSConfig.h.in new file mode 100644 index 00000000000..9367a43b986 --- /dev/null +++ b/devel/gnustep-base/patches/patch-Headers_GNUstepBase_GSConfig.h.in @@ -0,0 +1,17 @@ +$NetBSD: patch-Headers_GNUstepBase_GSConfig.h.in,v 1.1 2015/05/08 14:16:21 christos Exp $ + +Avoid redefinition of macros from cdefs_elf.h; this is not the OS's fault, +but GNUstep's for violating the implementation namespace with __weak and +friends. + +--- Headers/GNUstepBase/GSConfig.h.in.orig 2015-05-07 15:49:03.000000000 +0000 ++++ Headers/GNUstepBase/GSConfig.h.in +@@ -386,6 +386,8 @@ typedef struct { + #endif + + #if !__has_feature(objc_arc) ++# undef __weak ++# undef __strong + # if __OBJC_GC__ + # define __strong __attribute__((objc_gc(strong))) + # define __weak __attribute__((objc_gc(weak))) |