diff options
| author | joerg <joerg> | 2014-02-24 16:10:29 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-02-24 16:10:29 +0000 |
| commit | 3a1b281c53912e33bd244d869d512dd8012a5ea6 (patch) | |
| tree | 15058071d88f8ce8cf3e62a21141ac5e0340940e | |
| parent | 2a446653f9d3647e8bd7da49fda918510a3e9bc0 (diff) | |
| download | pkgsrc-3a1b281c53912e33bd244d869d512dd8012a5ea6.tar.gz | |
Don't build expr.c with optimisations when using Clang.
| -rw-r--r-- | textproc/groonga/Makefile | 7 | ||||
| -rw-r--r-- | textproc/groonga/distinfo | 3 | ||||
| -rw-r--r-- | textproc/groonga/patches/patch-lib_Makefile.in | 22 |
3 files changed, 30 insertions, 2 deletions
diff --git a/textproc/groonga/Makefile b/textproc/groonga/Makefile index 754efe0fb8a..9af3781fe0a 100644 --- a/textproc/groonga/Makefile +++ b/textproc/groonga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2014/02/21 12:45:26 obache Exp $ +# $NetBSD: Makefile,v 1.35 2014/02/24 16:10:29 joerg Exp $ # DISTNAME= groonga-4.0.0 @@ -51,6 +51,11 @@ REPLACE_RUBY+= data/munin/groonga_status_ REPLACE_RUBY+= data/munin/groonga_throughput_ .include "../../lang/ruby/replace.mk" +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +MAKE_ENV+= CLANG_NO_OPT=-O0 +.endif + .include "../../devel/editline/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/groonga/distinfo b/textproc/groonga/distinfo index 31f055420d7..a06c8f5ea71 100644 --- a/textproc/groonga/distinfo +++ b/textproc/groonga/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.23 2014/02/21 12:45:26 obache Exp $ +$NetBSD: distinfo,v 1.24 2014/02/24 16:10:29 joerg Exp $ SHA1 (groonga-4.0.0.tar.gz) = 9a64d4c98eda4db563bcaf9464504d24dfdb3ff4 RMD160 (groonga-4.0.0.tar.gz) = 2242bfc5492ae29c693877b66a40e87c3759e827 Size (groonga-4.0.0.tar.gz) = 9483418 bytes +SHA1 (patch-lib_Makefile.in) = 317365c902ba635b97e4fa2aaceb037f420015e4 SHA1 (patch-lib_geo.h) = 0a3ae38000542a2bb68b47cf59dbe3d41f462e54 diff --git a/textproc/groonga/patches/patch-lib_Makefile.in b/textproc/groonga/patches/patch-lib_Makefile.in new file mode 100644 index 00000000000..4cbf40829c4 --- /dev/null +++ b/textproc/groonga/patches/patch-lib_Makefile.in @@ -0,0 +1,22 @@ +$NetBSD: patch-lib_Makefile.in,v 1.3 2014/02/24 16:10:29 joerg Exp $ + +--- lib/Makefile.in.orig 2014-01-28 03:29:35.000000000 +0000 ++++ lib/Makefile.in +@@ -683,13 +683,15 @@ distclean-compile: + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + ++CFLAGS.expr.c= ${CLANG_NO_OPT} ++ + .c.lo: + @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +-@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ ++@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< ${CFLAGS.$<} &&\ + @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< ${CFLAGS.$<} + + .cpp.o: + @am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ |