diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-05-04 18:49:51 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-05-04 18:49:51 +0000 |
| commit | 07cf8b833ce02a905a3628fc05a3552376dd05c4 (patch) | |
| tree | 2776a37632ea10b5845c5e85f69ff4fbfa87c7ea /dev-java/libreadline-java | |
| parent | dev-util/pkgconfig -> virtual/pkgconfig (diff) | |
| download | historical-07cf8b833ce02a905a3628fc05a3552376dd05c4.tar.gz historical-07cf8b833ce02a905a3628fc05a3552376dd05c4.tar.bz2 historical-07cf8b833ce02a905a3628fc05a3552376dd05c4.zip | |
Respect CC and CFLAGS. #296741
Package-Manager: portage-2.1.10.57/cvs/Linux x86_64
Diffstat (limited to 'dev-java/libreadline-java')
4 files changed, 47 insertions, 20 deletions
diff --git a/dev-java/libreadline-java/ChangeLog b/dev-java/libreadline-java/ChangeLog index bacd2f02b52c..21404a640bc3 100644 --- a/dev-java/libreadline-java/ChangeLog +++ b/dev-java/libreadline-java/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/libreadline-java # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.37 2012/04/13 18:50:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/ChangeLog,v 1.38 2012/05/04 18:49:51 sera Exp $ + + 04 May 2012; Ralph Sennhauser <sera@gentoo.org> + libreadline-java-0.8.0-r3.ebuild, + +files/libreadline-java-0.8.0-respect-flags.patch: + Respect CC and CFLAGS. #296741 13 Apr 2012; Ulrich Müller <ulm@gentoo.org> libreadline-java-0.8.0-r3.ebuild: diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest index 1e8cb034cb2e..0a1595380786 100644 --- a/dev-java/libreadline-java/Manifest +++ b/dev-java/libreadline-java/Manifest @@ -3,26 +3,21 @@ Hash: SHA1 AUX libreadline-java-0.8.0-gmake.patch 532 RMD160 52332ec31aa362aa4ab590373f92a84b77eabcab SHA1 1c280b78f519bca63d12c202182ab2fcc02e64bd SHA256 2d8575b101f5856bf7ced9eb8d606eaa6be2386db9bec871aadb5033442f182e AUX libreadline-java-0.8.0-ldflags.patch 528 RMD160 7a88cb5300a04385880abb8d34eeed2f9ac6f083 SHA1 1d43475d1b6b9d5ca6f02aac5ff7c9eef722b8a6 SHA256 b25694f4c2ea4dd9052f81ae37ba64b7279c80d20a13ed28fece97c1d8f1fd33 +AUX libreadline-java-0.8.0-respect-flags.patch 651 RMD160 6c2ff46b7be0ebcaafa011fe343b2b132ebbc91e SHA1 35af017ff4730c6590c1ba32c9cd1faa75e6e38d SHA256 4c2fdb6cc0b2cc3071fad5af144a95462d6ee3d8a4c701fcc1f973eca34546e5 AUX termcap-to-ncurses.patch 498 RMD160 fc25fda35386128dbf61dc73bb2ee347e73be296 SHA1 c92c7080618b00d5e27c88f4755ea441bf21cbc7 SHA256 de636c7cc3e812a276ac530b571d7c9a0fd63cd7011868ceb46a59fc55f2e337 DIST libreadline-java-0.8.0-src.tar.gz 77122 RMD160 1e1d6f6e3bd37867d8222421857cbc73d072a3c1 SHA1 1f5574f9345afc039e9c7a09ae4979129891d52a SHA256 cdcfd9910bfe2dca4cd08b2462ec05efee7395e9b9c3efcb51e85fa70548c890 EBUILD libreadline-java-0.8.0-r2.ebuild 1352 RMD160 ab439c8456492836e80b36b59528fb44135a9a9a SHA1 1e8ed2944d40f761fa7b0e19a141381a27b980f7 SHA256 740f41c02498caa14ef18fa9b5db4336b0fc216ee7c1c698db4394daae4bc08b -EBUILD libreadline-java-0.8.0-r3.ebuild 1407 RMD160 1ae46526dc6b0797a334f974e00b4d75a1b54a0c SHA1 1251e04cc2097b84ed705549f7ac8284acdfb54d SHA256 4492d111464fccca13ca60ad1fa5d54cedac6848c833ca4c1186f4082bf489b5 -MISC ChangeLog 5185 RMD160 4a83096608bb4433834be748acbaab01653474b5 SHA1 05baf6f4965bdc0dde48a8a2688960960e086a9d SHA256 a761862cc6001ef2bb8e1a732d25dbbe535b39ee8d68efb520e8044e8e42b188 +EBUILD libreadline-java-0.8.0-r3.ebuild 1428 RMD160 fbc9505b70b233fcb53c2657e23886a382e9638a SHA1 5951f3dc1d17711b24e797d562bcd7df89e1611d SHA256 467d923902f750421dce3f62a3c5f4fb6cdab75274eeb5182b11f1e8d9aaf68a +MISC ChangeLog 5359 RMD160 c899c530ada8ca56112f2477a0656b5a2871dd35 SHA1 b1252c3876fa0f5ae8d4bb06f371005815bc0d62 SHA256 65f6c587e2e116c33441a3d1d5351b35e48191aa1d6f074ce17804162a9726e8 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPiHYwAAoJEDxpGckxwJCBICUP/AuwxY7y4XlVA36QfIc2W844 -epw7baob7RtdQpCNu6ObKi8Htjdzvtfs/gnC50tgHvr7Szqrp2YTHc4E6YOjxc7w -aU0+7IY7DT54Z9ADfZGZJ6lnR3XPnWeOrthRKAmuqmUuYdU8xAOMgaaJOLEDgFEr -nwbi3F/bYv3XtyBjGtPL/B0bn9wUR9AJBlA43fPSQooBTaHJjrfnIDSETIXbvQzw -rEaAO5ZSYX/7ZbN4iDwZTaJ2De3VLRZnxoAFb+R0OsnOhqV3p1KdZ6arSo5yZmV6 -jTvxy6l3vWjmR/zGou91BhkXW4H+wUVnA3zvs9AGaTyDJx7WstimedQ1Yl7XJGEZ -rsp8QuY4DVaezFGekTX7308bI438BBLQFRZ6ejmCSBUAatAcNYvTvpqmC3aKAG6R -Yimyz2dQ+89vBabpy++0x34G7A8VeE1Cj+Llc1bfH8OQVttp8SXXR1dL69aCTIRn -MAotnuEGPsqjbv0kEzNgf0bBRkvRRy3RbhqB+x/pU2Lr0CIzAK5H6phhIBw4wBI7 -uYiR+9RB+p0d7NQ2TZ7OIZBZjCKOXZkvgHW/AWZpfGTOukkL1px754vtq3Kzgd7p -sQTYTQ9ObS9gRRB3mucpFUPguqcIkVjSR74tbzIfnpIXOq9Iqinha9PTB+izr021 -OXhKk6pjeWaQuXHhBX3A -=EMDI +iQEcBAEBAgAGBQJPpCTeAAoJEIUJ+svaV163ayYH/R1sWeMyqL8oGCRQDwlI0J+x +WLbNKObEA1IXC67zMmzv5YyptF42umaztl0eUFGEB851mUEbrBZ9KU1/kVvN229J +S4Ut+X5qi6ZQwDr8g/Nk0NzSZj+yFbCTCXyTctOTC8PPmUKv8Sg9rGpKamLSXpdW +vZkXZ89bJk/ip4CxxEeYZCF6dwJkiHEMSd8tX5ux6DIYnNiaL01OJhnQVog7BszH +N+RsRLeRebjIjd8KTNiryh6T76jpAddmnw2T+kaqXROH8BxkRKbe1PySVmxIk7Dc +5+gvWa+gCpaAE7fDaGl5zYNPcq83oqN6XovN9I2xOOoDJANcgRQSgPhfXxGhOmE= +=qsZJ -----END PGP SIGNATURE----- diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch new file mode 100644 index 000000000000..9af21ba83d4b --- /dev/null +++ b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch @@ -0,0 +1,27 @@ +diff --git a/src/native/Makefile b/src/native/Makefile +index 679adb7..a1f2a6a 100644 +--- a/src/native/Makefile ++++ b/src/native/Makefile +@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap + ifeq (cygwin,$(WIN32)) + JavaGetline_LIBS = -lcygwin + endif +-CC = gcc ++CC ?= gcc + OBJ_EXT := o + LIB_PRE := lib + LIB_EXT := so +-CFLAGS=-fPIC -DPOSIX ++CFLAGS += -fPIC -DPOSIX + endif + + +@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32)) + $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \ + $(OBJECTS) -W1,-e,_readline_init@12 + else +- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ ++ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@ + endif + endif + diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild index cca25368920c..f60ea6a8b2a8 100644 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild +++ b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.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-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild,v 1.7 2012/04/13 18:50:06 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild,v 1.8 2012/05/04 18:49:51 sera Exp $ EAPI=2 JAVA_PKG_IUSE="doc source" @@ -34,8 +34,8 @@ java_prepare() { sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed" fi - #Respect LDFLAGS bug #336302 - epatch "${FILESDIR}"/${P}-ldflags.patch + #Respect CC CFLAGS LDFLAGS #336302 #296741 + epatch "${FILESDIR}"/${P}-respect-flags.patch } src_compile() { |