[97205] trunk/dports/x11/herbstluftwm

[cal at macports.org]

Revision: 97205
          https://trac.macports.org/changeset/97205
Author:   cal at macports.org
Date:     2012-08-30 01:03:03 -0700 (Thu, 30 Aug 2012)
Log Message:
-----------
herbstluftm: fix universal build, closes #35896

Modified Paths:
--------------
    trunk/dports/x11/herbstluftwm/Portfile

Added Paths:
-----------
    trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff
    trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff

Modified: trunk/dports/x11/herbstluftwm/Portfile
===================================================================
--- trunk/dports/x11/herbstluftwm/Portfile	2012-08-30 02:00:49 UTC (rev 97204)
+++ trunk/dports/x11/herbstluftwm/Portfile	2012-08-30 08:03:03 UTC (rev 97205)
@@ -33,7 +33,9 @@
 livecheck.url           ${master_sites}
 livecheck.regex         ${name}-(\[0-9\]+(\\.\[0-9\]+)*)\\${extract.suffix}
 
-patchfiles              config.patch
+patchfiles              config.patch \
+                        patch-Makefile-separate-cppflags.diff \
+                        patch-config.mk-separate-cppflags.diff
 
 depends_build           bin:a2x:asciidoc \
                         port:pkgconfig
@@ -48,7 +50,7 @@
 use_configure           no
 
 build.env-append        PKG_CONFIG_PATH=$prefix/lib/pkgconfig \
-                        CFLAGS="-pedantic -Wall ${configure.cflags} [get_canonical_archflags]" \
+                        CFLAGS="${configure.cflags} [get_canonical_archflags]" \
                         LDFLAGS="${configure.ldflags} [get_canonical_archflags]"
 
 build.args-append       CC=${configure.cc} \

Added: trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff
===================================================================
--- trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff	                        (rev 0)
+++ trunk/dports/x11/herbstluftwm/files/patch-Makefile-separate-cppflags.diff	2012-08-30 08:03:03 UTC (rev 97205)
@@ -0,0 +1,19 @@
+--- Makefile.orig	2012-08-30 08:24:35.000000000 +0200
++++ Makefile	2012-08-30 08:37:45.000000000 +0200
+@@ -34,12 +34,13 @@
+ 
+ %.o: %.c version.mk
+ 	$(call colorecho,CC,$<)
+-	$(VERBOSE) $(CC) -c $(CFLAGS) -o $@ $<
+-	$(VERBOSE) $(CC) -c $(CFLAGS) -o $*.d -MT $@ -MM $<
++	$(VERBOSE) $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
++	$(VERBOSE) $(CC) -c $(CPPFLAGS) -o $*.d -MT $@ -MM $<
+ 
+ info:
+ 	@echo Some Info:
+-	@echo Compiling with: $(CC) -c $(CFLAGS) -o OUT INPUT
++	@echo Preprocessing with: $(CC) -E $(CPPFLAGS)
++	@echo Compiling with: $(CC) -c $(CPPFLAGS) $(CFLAGS) -o OUT INPUT
+ 	@echo Linking with: $(LD) -o OUT $(LDFLAGS) INPUT
+ 
+ clean: cleandoc cleandeps

Added: trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff
===================================================================
--- trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff	                        (rev 0)
+++ trunk/dports/x11/herbstluftwm/files/patch-config.mk-separate-cppflags.diff	2012-08-30 08:03:03 UTC (rev 97205)
@@ -0,0 +1,23 @@
+--- config.mk.orig	2012-08-10 17:23:41.000000000 +0200
++++ config.mk	2012-08-30 08:39:07.000000000 +0200
+@@ -17,15 +17,15 @@
+ # FLAGS
+ CC ?= gcc
+ LD = $(CC)
+-CFLAGS ?= -g -pedantic -Wall
+-CFLAGS += -std=c99 ${INCS} -D _XOPEN_SOURCE=600
++CFLAGS ?= -g
++CFLAGS += -pedantic -Wall -std=c99
+ VERSIONFLAGS = \
+     -D HERBSTLUFT_VERSION=$(VERSION) \
+     -D HERBSTLUFT_VERSION_MAJOR=$(VERSION_MAJOR) \
+     -D HERBSTLUFT_VERSION_MINOR=$(VERSION_MINOR)
+-CFLAGS += $(VERSIONFLAGS)
+-CFLAGS += $(XINERAMAFLAGS)
+-CFLAGS += -D HERBSTLUFT_GLOBAL_AUTOSTART=\"$(CONFIGDIR)/autostart\"
++CPPFLAGS ?=
++CPPFLAGS += $(INCS) -D _XOPEN_SOURCE=600 $(VERSIONFLAGS) $(XINERAMAFLAGS)
++CPPFLAGS += -D HERBSTLUFT_GLOBAL_AUTOSTART=\"$(CONFIGDIR)/autostart\"
+ LDFLAGS ?= -g
+ DESTDIR = /
+ PREFIX = /usr/local
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120830/07316bd9/attachment.html>