diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-13 19:35:19 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-10-13 19:35:19 +0100 |
| commit | 5092723d06263ce25e8fbfacbeabe5e5e5e55f8e (patch) | |
| tree | 8bc0defb5220a71b9964ed8528ce690f97b6bce7 /dev-libs/Ice | |
| parent | Release slicer 1.4 and related deps changes (diff) | |
| download | portage-5092723d06263ce25e8fbfacbeabe5e5e5e55f8e.tar.bz2 portage-5092723d06263ce25e8fbfacbeabe5e5e5e55f8e.tar.xz portage-5092723d06263ce25e8fbfacbeabe5e5e5e55f8e.zip | |
Fix quirks of building on 32bit
Diffstat (limited to 'dev-libs/Ice')
| -rw-r--r-- | dev-libs/Ice/Ice-3.6.3-r1.ebuild (renamed from dev-libs/Ice/Ice-3.6.3.ebuild) | 5 | ||||
| -rw-r--r-- | dev-libs/Ice/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/Ice/files/dont-append-32-to-bins.patch | 20 |
3 files changed, 25 insertions, 3 deletions
diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild index 8363be6..9f1a2e2 100644 --- a/dev-libs/Ice/Ice-3.6.3.ebuild +++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild @@ -59,6 +59,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/dont-separate-c++11-libs.patch epatch ${FILESDIR}/dont-append-c++11-to-libs-3.6.3.patch + epatch ${FILESDIR}/dont-append-32-to-bins.patch } src_prepare() { @@ -115,12 +116,12 @@ src_configure() { install_docdir=\"${ED}/usr/share/doc/${PF}\" install_configdir=\"${ED}/usr/share/Ice-${PV}/config\" install_mandir=\"${ED}/usr/share/man\" - embedded_runpath_prefix=\"${EPREFIX}/usr\" - LP64=yes" + embedded_runpath_prefix=\"${EPREFIX}/usr\"" use ncurses && MAKE_RULES="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no" use debug && MAKE_RULES="${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes" use c++0x && MAKE_RULES="${MAKE_RULES} CPP11=yes" || MAKE_RULES="${MAKE_RULES} CPP11=no" + use amd64 && MAKE_RULES="${MAKE_RULES} LP64=yes" local BERKDB_VERSION="$(suitable_db_version)" MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})" diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index 72d4a52..cad9247 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -1,7 +1,8 @@ +AUX dont-append-32-to-bins.patch 468 SHA256 0359f08d7a68ed18a29ea1d36be10e2587db22ad5c72fbe37ef749cdfbd1f3b5 SHA512 5730eb883cf2ed4d22fa64f45d78c5535ac357bd5c6fce1b1f66a98afe56ab95908ca7d4e35165078123151a594c3a4e924908801388c8a93d8b0fa2a0d9b657 WHIRLPOOL e96d4f65980668efe3b05c78d387ee8bb326b8157a918f7e7a59f8063b3cd70f037ca26bec10c8fa8552ec4f32d2d90e8a898838a51b74ed5fb1bf8356f064e6 AUX dont-append-c++11-to-libs-3.6.3.patch 353 SHA256 d0413eaacf5f5916eba42d5b05e227814c2b8fdf3a77ec62602da6cfe6c40bb0 SHA512 27a9906ac7689bd457119eb937b255755fec34e32fca2ebfec13e951bce1e9c8bd1135e6158a9bca1a64a55e9a43847d54fee7a302fb0db6c410726a1a345cec WHIRLPOOL b7f487a8153b2e132bef4d9db1ecf525798a70078bac35ce227317485d3317f62326d7f66b41d12ed3e8e55585de9405d1ca5bfa5a8c7be788504de84bbd1255 AUX dont-append-c++11-to-libs.patch 581 SHA256 8a535e9b7a88f37c13c6f68c935d8f48d996971d6189aa57652ceffc984813b2 SHA512 c542d969dba35eb976ef1a0293fe00597f06db48f2b31a44575beb3961e2d161affa5837ac2003a9db2b59055db4c2db4a28eb989e15224cc56e80e00b8bf68c WHIRLPOOL 4c06a08f71c0c7ecf629a37ac7081220ef148b7d9fd69abe0ecf112ba449e9b84e031611e48502884172570f4f75f14ba9164ceb61df617006c8aacf48a9d7c4 AUX dont-separate-c++11-libs.patch 537 SHA256 acd69d499f13c743b64113c471e68d0029a9b65c5b032c5cc74f0823e8c9dfeb SHA512 deb33b6819f231a4219e744dc11772ac792b05f41cd887ea00eb92471596563b7cd83973f5013bf0d685be0da77e3d3b6d83012dd08d452a1417b53eb83f0bb2 WHIRLPOOL 3319be0874db00ec4d4cc9d480276e71b0452bd1e652ebcfc6d531a03cdfdb84a9efbb35450a732ea2d39b615d0059d303f73c6ecb423ce6ecfcf4d0e47b6439 DIST Ice-3.6.2.tar.gz 5393239 SHA256 5e9305a5eb6081c8f128d63a5546158594e9f115174fc91208f645dbe2fc02fe SHA512 fb6b70edd551c66ba801a3a0af0d9101206e771e607e2feffa53fdac95215837bedce2f44251f04d1915c02130b1341daf96d3357b13e4b59d4fae01c14d8e5f WHIRLPOOL 84d4991d8d4379242dcdf0ec0b60242c4a72579ce462a40d107a61088deddb7aa703b8a4f342f7c30e8cd35371471ec9e7592fc94132e4917815f111d4ec77a9 DIST Ice-3.6.3.tar.gz 5512741 SHA256 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45 WHIRLPOOL 4e2d50aaf62f805a0c5471ab907c7680607de5fe101c96a740a3bc1b8ddc7ea93d768ba5886b26772647eb173417195bd808399192b2d2c7d5adb40cf38fc95f EBUILD Ice-3.6.2.ebuild 7354 SHA256 9e7862faabdf2032560eed8afe9c19a97665dcdc82b673b1db30177732d01878 SHA512 a38bf3ac252179457c09825edcb20602df7e1f4a144263778317eb3cdd2109e9c3d9b2c33ad4348d426fde141b7442137cce8a5bf1ab31683aa3c4f47de0ff28 WHIRLPOOL bef9a08204a1625c90a8d55719ee875f74bcb1bca961ed7d31c58459bc325fb1349dbe17c59c45248efea8fd0e3647e22eb6d4f1fe2e0e9297099058855a3a37 -EBUILD Ice-3.6.3.ebuild 7360 SHA256 9901dae82107ff9f17dfdf173f6ed4f7be77eb6f5e8b8ef81a3a8dcad00b455b SHA512 c127118e80d992173d4fcaa2d34128b74904a0a8c84dc4b0cfc5a476eb04d2ae69cbb8772b9d1577defcd9785796cc4ea6236edf1227eb68c8fea7a406a116dc WHIRLPOOL d42c653f19020bba6117bdea92c1ddcb8643b7f13e88ef6a54cbb70b324cd0580530e519c8cb0270870f4da7592e49a3036e56a5e144677d61f9746f341194ea +EBUILD Ice-3.6.3-r1.ebuild 7448 SHA256 e890174d8ab9095cbfafdf5116eec3bf7625958397b1e803cc4947cce801611b SHA512 709cf3e6b307fb8924e791c2a2e1f60008f4b5f732e94df0ef5336bbd0534207217fd2d9a26597ecf4fb9322f070faa0ae51e434c169cd67789f0edacde088ce WHIRLPOOL c46ec28e0557f6f4173889f892d2fd19e7143ba18c7b4eb19640ffc46d155abd2bd3edd93550a81eef530f55d405c24890c593e4b09541741e5ce0ac59bef394 diff --git a/dev-libs/Ice/files/dont-append-32-to-bins.patch b/dev-libs/Ice/files/dont-append-32-to-bins.patch new file mode 100644 index 0000000..88744ed --- /dev/null +++ b/dev-libs/Ice/files/dont-append-32-to-bins.patch @@ -0,0 +1,20 @@ +diff --git a/config/Make.common.rules b/config/Make.common.rules +index d21f1cd..66bbda9 100644 +--- a/config/Make.common.rules ++++ b/config/Make.common.rules +@@ -111,15 +111,6 @@ ifeq ($(UNAME),Linux) + endif + endif + endif +- +- # +- # x86 builds uses 32 binsuffix +- # +- ifneq ($(STATICLIBS),yes) +- ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE)) +- binsuffix = 32 +- endif +- endif + endif + + ifeq ($(CPP11),yes) |