diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-08-21 18:33:20 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-08-21 18:33:20 +0000 |
| commit | 64f440d7fde60ddbc2a8a99f2857e9778850fe66 (patch) | |
| tree | bb8acacc706e1ab4efa1ff2f0ff722f133ea1e55 /dev-lang/nqc | |
| parent | Stable channel bump. (diff) | |
| download | gentoo-2-64f440d7fde60ddbc2a8a99f2857e9778850fe66.tar.gz gentoo-2-64f440d7fde60ddbc2a8a99f2857e9778850fe66.tar.bz2 gentoo-2-64f440d7fde60ddbc2a8a99f2857e9778850fe66.zip | |
respect flags wrt #432200
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/nqc')
| -rw-r--r-- | dev-lang/nqc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/nqc/files/nqc-3.1_p6-flags.patch | 73 | ||||
| -rw-r--r-- | dev-lang/nqc/nqc-3.1_p6.ebuild | 17 |
3 files changed, 84 insertions, 12 deletions
diff --git a/dev-lang/nqc/ChangeLog b/dev-lang/nqc/ChangeLog index 2b558afa7f84..3307bb9f8b57 100644 --- a/dev-lang/nqc/ChangeLog +++ b/dev-lang/nqc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/nqc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.20 2012/07/04 19:46:56 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.21 2012/08/21 18:33:20 hasufell Exp $ + + 21 Aug 2012; Julian Ospald <hasufell@gentoo.org> nqc-3.1_p6.ebuild, + +files/nqc-3.1_p6-flags.patch: + respect flags wrt #432200 04 Jul 2012; Justin Lecher <jlec@gentoo.org> nqc-3.1_p6.ebuild, +files/nqc-3.1_p6-gcc-4.7.patch: diff --git a/dev-lang/nqc/files/nqc-3.1_p6-flags.patch b/dev-lang/nqc/files/nqc-3.1_p6-flags.patch new file mode 100644 index 000000000000..a27d1e454a03 --- /dev/null +++ b/dev-lang/nqc/files/nqc-3.1_p6-flags.patch @@ -0,0 +1,73 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Tue Aug 21 18:14:15 UTC 2012 +Subject: build system + +respect flags + +--- Makefile ++++ Makefile +@@ -67,7 +67,7 @@ +
+ # CFLAGS
+ #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes
+-CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
++CXXFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
+
+ USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
+
+@@ -87,20 +87,20 @@ + # Linux
+ # uncomment this next line if you have the USB tower library installed
+ # USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
+- CFLAGS += -I/usr/local/include/LegoUSB -Wno-deprecated
++ CXXFLAGS += -I/usr/include/LegoUSB -Wno-deprecated
+ else
+ ifneq (,$(findstring $(OSTYPE), SunOS))
+ # Solaris
+- CFLAGS += -DSOLARIS
++ CXXFLAGS += -DSOLARIS
+ else
+ ifneq (,$(strip $(findstring $(OSTYPE), FreeBSD)))
+ # FreeBSD
+ USBOBJ = rcxlib/RCX_USBTowerPipe_fbsd.o
+ DEFAULT_SERIAL_NAME = "/dev/cuad0"
+- CFLAGS += -Wno-deprecated
++ CXXFLAGS += -Wno-deprecated
+ else
+ # default Unix build without USB support
+- CFLAGS += -O6
++ CXXFLAGS += -O6
+ endif
+ endif
+ endif
+@@ -113,7 +113,7 @@ + ifndef DEFAULT_SERIAL_NAME
+ DEFAULT_SERIAL_NAME = "/dev/ttyS0"
+ endif
+-CFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
++CXXFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
+
+ #
+ # Object files
+@@ -164,10 +164,10 @@ + $(MKDIR) bin
+
+ bin/nqc : compiler/parse.cpp $(OBJ)
+- $(CXX) -o $@ $(OBJ) $(LIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+
+ bin/mkdata : mkdata/mkdata.cpp nqc/SRecord.cpp
+- $(CXX) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp
+
+ #
+ # clean up stuff
+@@ -227,7 +227,7 @@ + # general rule for compiling
+ #
+ .cpp.o:
+- $(CXX) -c $(CFLAGS) $< -o $*.o
++ $(CXX) -c $(CXXFLAGS) $< -o $*.o
+
+
+ #
diff --git a/dev-lang/nqc/nqc-3.1_p6.ebuild b/dev-lang/nqc/nqc-3.1_p6.ebuild index 07057190cdd4..6624df58d0e2 100644 --- a/dev-lang/nqc/nqc-3.1_p6.ebuild +++ b/dev-lang/nqc/nqc-3.1_p6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.4 2012/07/04 19:46:56 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.5 2012/08/21 18:33:20 hasufell Exp $ EAPI=4 @@ -20,13 +20,12 @@ RDEPEND="${DEPEND}" S="${WORKDIR}" +pkg_setup() { + tc-export CXX +} + src_prepare() { - epatch "${FILESDIR}"/${P}-gcc-4.7.patch - sed \ - -e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \ - -e 's|/usr/local|/usr|' \ - -i Makefile \ - || die "sed Makefile" + epatch "${FILESDIR}"/${P}-{gcc-4.7,flags}.patch } src_configure() { @@ -35,10 +34,6 @@ src_configure() { fi } -src_compile() { - emake CXX=$(tc-getCXX) LDFLAGS="${LDFLAGS}" -} - src_install() { dobin bin/* newman nqc-man-2.1r1-0.man nqc.1 |