diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/nqc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/nqc/Manifest | 19 | ||||
| -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 |
4 files changed, 101 insertions, 14 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/Manifest b/dev-lang/nqc/Manifest index 2300fa18b5cd..1df5b6c88bc1 100644 --- a/dev-lang/nqc/Manifest +++ b/dev-lang/nqc/Manifest @@ -1,10 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX nqc-2.5.1-gcc34-fix.patch 425 SHA256 4bc45e56d2170a7839f20c1ee95cc09b3fc18413a8e09eb9be6b932c5ca8cc4e SHA512 50594eda4e1cb49d554618e8498fa69b6834ebed2e74545a5b12541eca6387db18bc6ed729abcb80a525b7b8591f28b6fbcc1daaf2e711602c587ac2f95491af WHIRLPOOL 7034a5c40f6b8731c4a0b818d8166630ced3bf39d70d3faa4fd2cfc32ace61d5c8f071ff70446c196eab122215727747a7bc2fd871cdfbac94121387338b31f5 AUX nqc-3.1_p4-amd64.patch 558 SHA256 6deef54a5055f021e0a12fcceb3d549a2d14c3d0afbd616aa2c410e7d26b48c4 SHA512 0626ac5e5df34fc3fff4d586a469e3599c3e009dac846638c6b74b48202b4990dd290f957168a12290be5d5a46212dbf55da2b4cbc88cfc9497c7d5d2a4bf738 WHIRLPOOL 3ed8cd473d073f793fba7fc78fb737e4dfc1815c95cb8b74316ccd854a37e1668360da3c2c5ce9a746cc86057da669b1fada1baff105c7e2fe6671306b5b3a50 AUX nqc-3.1_p4-usb.patch 924 SHA256 95e46c483aed06df20dad0a6e817953733425fe9b3b94d0f60d0c2253e41f8c6 SHA512 f17d3fec5e4689dc3de85f597d36739ea52149204a40f54bdb5f8204480573ddf47c64b8c33f8551b63fff3fd52522ab8c5c05c78bf9505fbec2f0048f112df6 WHIRLPOOL a02d6ca22482f4333313cc808a01d8951fd3a01181ef7d82625b9a7ae64eacb1cbbef0a02f3aaf60d8053b5df25247af4b43a592d52b14b63cb26986c26807da +AUX nqc-3.1_p6-flags.patch 1950 SHA256 11db79ae3b20b2307300d2ae6793196805cc8e09d5492d4da90dc5c9815028f7 SHA512 e6cf6a01aca794e8d70e92b2df1d4e02dadb5e518892a15737e7bd54b3973693d09a277b2739c9943249d438de346c30e4eadf2378b17d645a6c506eb8c09ddf WHIRLPOOL 2489964c46abd84913a03f9bb93a6ce440fc8e7261442895fd0b2dd70020206f93b51d9e0c1b80409ab57840f90fcd1a1f82b7e58e0a358bec38ee0270bffecf AUX nqc-3.1_p6-gcc-4.7.patch 412 SHA256 072ef0b0f53bfb1b2bdca8d0b81d7eb57b76629b1e3e6a75e853ba514909fd42 SHA512 dedf30422b5e5170ca0c55947e184ef7b612e8a4474f020f8d244ba9e1b497ce0ea5682f4022570b737320099dccd2e0da2584a38c0c482bf14dc08e4d5ad8e3 WHIRLPOOL c207f9b389a1c82900841bb87ddc06d7fbb15cc7e6056f376150b8ce228e12bbb689d68c2674087549f1553609918970d99ea9e7e132aab11e0ccb480d441a04 DIST nqc-2.5.r1.tgz 215808 SHA256 439eab22f21e8e28c296c17dd2340956a8c4b2a75d868885df49202d0a8795e2 SHA512 0653072ce2b711c3ec8930dfcef774ce6ed56e96c2722cd30fb78a9fc169e42dcc0379a685f4e1a7880674ad15a46cd558af5d7fb84c89206eb3eff87beccc0b WHIRLPOOL 29104b5333ad470557f0a87e970bdbae932ad45101bfa3ec151b306fb673672f5b1ea90a0136bc15f513a4f0436999b47a1e97cb37de28f2fd02e021258ee2e0 DIST nqc-3.1.r6.tgz 329410 SHA256 bfd5e654f639af7a588cfdef4d22bd5efcfff547b10a56cebebde58ef2bfe766 SHA512 7ec7015861b5f8e063e3a2567f5c6ff7e5c6a65b60fab9bef71411d59b13a588f284ee3a8d06b9325748c209e21f9480b9792bc605148e2a4af64b90f872e2aa WHIRLPOOL 72c2dcb63bbdc1a1d35e0bb17c1c2838f688c69ef48d0958663c99c48855454b99a586603309b238e23eb6adc87edff40800c9ff1f81c12829d61d7e95b0a757 EBUILD nqc-2.5.1.ebuild 1234 SHA256 e8dfc0be1a07e00d67874d5fba98f83c322dd7933ad61f8ba28b735894b2947c SHA512 9717eacf453073724ec4921638b761e556af31d7c95cd817c69f74f4f115020de4e5c6c87f01593541b527ea1582b8946ce35db9a850a8accf780be33148c26b WHIRLPOOL 8f5911c9ce0b3236193606b7efc92b5d64db8e8995fe0e615a6be9e4d72fd8ae36f671f9d7e58da034216898ec82671d5f6c40bb979f3d3144357579ebc7f113 -EBUILD nqc-3.1_p6.ebuild 1531 SHA256 8776b38a693018d187d43cdaf3ade675cd24f14f747f3e3bba972e3e3ddb5e26 SHA512 f07fbbf83072614458ffcd476f904b8d9b9746f03e2762835aee52564f2dac868b2e1dae5282ce852b41d898f48c2d3081f6f760e1c4cd056206af2060858c3b WHIRLPOOL 74986b8cc555e91a343551a45881bef3f06f6049c15e3024f521832367b9563aac543d40e97241ca1bafe650dd6da56b965dbae0f6f8e216b6bd7995164023c4 -MISC ChangeLog 894 SHA256 93cb6be3d89f81f0b3e625bfe7e70095ba0f22df5838146d615b24bdce0a2cc1 SHA512 c505781b93aac6e1d49dd24ca4d3bafa97a5dc7bdef2ff6a421846e1c314ed2c78309dde9bbd34b94b7192a815377c5b4b12d05d9b1f000634c9e57b76954fea WHIRLPOOL 8c83d23775118c934d327bdcd1cfd070f8da4b6ebb820d3efc17849257884b1e294ce0e443a988656e1da2222571a996b9dffeeac11a805b1fb4bcc83dbdfc60 +EBUILD nqc-3.1_p6.ebuild 1390 SHA256 93e18c2a9c9e66d0b923704b7fe8e9f6709f6dbc254a7b4c056b2097fbf17d78 SHA512 d3b45bbdeeee63285b6916eece2cb02a17ed780e4aa799d041143191d788165adb45bad6474232fcdfe0f3eebab8cdcb7fa4ab4be9c0012dcd1ffb9d54a3c821 WHIRLPOOL 973e5e3323a1e17023003a0befd6a895a01c0c0b2c7a7f328d26e69edfe4527d225b32ad8f0918c29813f6decae91abcd4d7b05dafb6a4dfc6c88795adbb05cb +MISC ChangeLog 1030 SHA256 9126e085bbf71a6e44bbc8bd49c51952433055d34297e81bc1e146c64cc6277c SHA512 cc3dfa54e28d045271c25295d2f27ef83b8b1caf85ccf06593b2332c9cd2afedfbf7c891c0ed3dd75be0a6cda96440e87e50f3c208b1d3c30058dfd591982121 WHIRLPOOL d335253bfb5b2ca0ad5abdc3ff27a20dd02dca4012aaaa0f3b8bef5dcc89691efffefe8c57d44f8e9aa2954432a104b3eecdd47676a29dc9631c40270a54b9e1 MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQM9NIAAoJEFpvPKfnPDWz17IIAJ+KlijV5gcTMTAAYjUxDOis +PFcksUciTOxpcZOv7B7Egop5y6ICseBtAtcmqKhtvsrL+7bi7sgF19nZtFXq20AL +fg04jTHQTEwX0JGB/GOCn4i9OQCFxG4/HWLWtcpGwwyaDkoOcQzMRdswYgH9WVv8 +RvjLrrKiPdoevKjw8wBglft+q43qPfk1UE4UB4EFPOtQAg48E9S6ku10wnpR9TqK +krIgvdQ128m9An+LMqo8IT6fpQ2wvBNNHbChk57cloL2DH1xti9SNvQr6fONa81r +U/CruPorHv3E0Ht4dIPNzXz7mttFAQ8HFGgLpz91h3EYFKAwgxIZKtXObXAOEuE= +=78pN +-----END PGP SIGNATURE----- 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 |