From 427079a95f8e133b84bb70981834d2feb7d2281e Mon Sep 17 00:00:00 2001 From: dholland Date: Tue, 3 Jan 2012 01:25:28 +0000 Subject: 1. Not MAKE_JOBS_SAFE. 2. Use MMFLAGS instead of MFLAGS as the compiler flags make variable. The latter interacts somewhat poorly with make's own usage of the same identifier. Do this by SUBST at post-extract time so nothing ever sees the original form, and adjust patches to match. Does not build (it cannot parse NetBSD's stdlib.h) but no longer explodes randomly. --- lang/objc/Makefile | 11 ++++++++++- lang/objc/distinfo | 6 +++--- lang/objc/patches/patch-aa | 4 ++-- lang/objc/patches/patch-ab | 10 +++++----- 4 files changed, 20 insertions(+), 11 deletions(-) (limited to 'lang/objc') diff --git a/lang/objc/Makefile b/lang/objc/Makefile index befe3f24e93..c57dfcdea8e 100644 --- a/lang/objc/Makefile +++ b/lang/objc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/09/09 02:43:09 obache Exp $ +# $NetBSD: Makefile,v 1.12 2012/01/03 01:25:28 dholland Exp $ DISTNAME= objc-3.2.6 CATEGORIES= lang @@ -12,6 +12,8 @@ COMMENT= Portable Object Compiler DIST_BS= objc-bootstrap-3.1.33 WRKSRC_BS= ${WRKDIR}/${DIST_BS} +MAKE_JOBS_SAFE= no + CONFIGURE_DIRS= ${WRKSRC_BS} ${WRKSRC} CONFIG_GUESS_OVERRIDE= ${WRKSRC_BS}/util/config.guess util/config.guess CONFIG_SUB_OVERRIDE= ${WRKSRC_BS}/util/config.sub util/config.sub @@ -23,6 +25,13 @@ USE_TOOLS+= lex yacc USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +SUBST_CLASSES+= mflags +SUBST_STAGE.mflags= post-extract +SUBST_MESSAGE.mflags= Changing 'MFLAGS' to 'MMFLAGS' +SUBST_SED.mflags= -e 's,MFLAGS,MMFLAGS,g' +SUBST_FILES.mflags= configure configure.in manual.html \ + */Makefile* src/*/Makefile* + pre-configure: ${ECHO} >> ${WRKSRC_BS}/configure \ '${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS} -f ${MAKE_FILE} ${BUILD_TARGET}' diff --git a/lang/objc/distinfo b/lang/objc/distinfo index 60bebfd80dd..569a5b4757c 100644 --- a/lang/objc/distinfo +++ b/lang/objc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 09:03:09 agc Exp $ +$NetBSD: distinfo,v 1.4 2012/01/03 01:25:28 dholland Exp $ SHA1 (objc-bootstrap-3.1.33.tar.gz) = d6e621d0a586c9767954eb3d9e042b4418ac6cf2 RMD160 (objc-bootstrap-3.1.33.tar.gz) = 9425d9a6f5ffe40dd92ceb21275ea38f2758c54c @@ -6,5 +6,5 @@ Size (objc-bootstrap-3.1.33.tar.gz) = 343075 bytes SHA1 (objc-3.2.6.tar.gz) = 983af46f131c3c8e259f3827f3b8bb6ebce76b35 RMD160 (objc-3.2.6.tar.gz) = e77277552f0535882e742b850fb073dab243cefb Size (objc-3.2.6.tar.gz) = 877706 bytes -SHA1 (patch-aa) = 1ab7815f8a205b3b78da2f74626693892fa35f84 -SHA1 (patch-ab) = f6f0d3bb2dba71743a02fb422391f9ec620f8f1c +SHA1 (patch-aa) = ad26cc667e248c87010c3df0e24885b330b4c342 +SHA1 (patch-ab) = 1b9ce954711131bfd8153f0ec390f8b0c6d78cda diff --git a/lang/objc/patches/patch-aa b/lang/objc/patches/patch-aa index 047a9ad005f..3fff4a885af 100644 --- a/lang/objc/patches/patch-aa +++ b/lang/objc/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/09/24 00:28:01 rh Exp $ +$NetBSD: patch-aa,v 1.2 2012/01/03 01:25:28 dholland Exp $ --- src/objc/Makefile.in.orig 2002-05-18 20:57:50.000000000 +1000 +++ src/objc/Makefile.in @@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/09/24 00:28:01 rh Exp $ + $(YACC) -d $*.ym -$(CP) $(YTABH) $*.h -$(CP) $(YTABC) $*.m - $(OBJC) -c $(MFLAGS) $(IFLAGS) $*.m + $(OBJC) -c $(MMFLAGS) $(IFLAGS) $*.m diff --git a/lang/objc/patches/patch-ab b/lang/objc/patches/patch-ab index 1bc6d2986a7..22e1b1cac92 100644 --- a/lang/objc/patches/patch-ab +++ b/lang/objc/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1 2005/01/14 09:18:56 adam Exp $ +$NetBSD: patch-ab,v 1.2 2012/01/03 01:25:28 dholland Exp $ --- configure.orig 2005-01-14 10:10:45.000000000 +0000 +++ configure @@ -3367,7 +3367,7 @@ USELFLAG=1; - MFLAGS=OPT_MFLAGS; + MMFLAGS=OPT_MMFLAGS; case $ac_cv_c_compiler_gnu in -- yes) OPT_MFLAGS='-DNDEBUG -O2';; -+ yes) OPT_MFLAGS='-DNDEBUG $(CFLAGS)';; - *) OPT_MFLAGS='-DNDEBUG';; +- yes) OPT_MMFLAGS='-DNDEBUG -O2';; ++ yes) OPT_MMFLAGS='-DNDEBUG $(CFLAGS)';; + *) OPT_MMFLAGS='-DNDEBUG';; esac -- cgit v1.2.3