diff options
| author |   Gregory M. Tuner <gmt@be-evil.net> | 2014-01-01 14:02:35 -0800 |
|---|---|---|
| committer | Gregory M. Tuner <gmt@be-evil.net> | 2014-01-01 14:02:35 -0800 |
| commit | 18cb5cdb247de32b767350de99e4abd6f068f1fb (patch) | |
| tree | 52ce0d4cbfa9b7f536cc75e52bb18a0ffa23d794 /dev-tcltk | |
| parent | dev-tcltk/blt: add --with-gentoo-libdir config-arg (diff) | |
| download | gmt-18cb5cdb247de32b767350de99e4abd6f068f1fb.tar.gz gmt-18cb5cdb247de32b767350de99e4abd6f068f1fb.tar.bz2 gmt-18cb5cdb247de32b767350de99e4abd6f068f1fb.zip | |
dev-tcltk/blt: add --with-ar confarg
Although recent automakes provide a handy-dandy AM_PROC_AR macro,
we are stuck with autoconf here, and can't use it. Instead
of injecting the value via sed-script, we add an argument and
provide it to the configure script. This will come in handy
later during multilib-utization.
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-tcltk')
| -rw-r--r-- | dev-tcltk/blt/Manifest | 3 | ||||
| -rw-r--r-- | dev-tcltk/blt/blt-2.4z-r13.ebuild | 8 | ||||
| -rw-r--r-- | dev-tcltk/blt/files/blt-2.4z-ar-withval.patch | 41 |
3 files changed, 46 insertions, 6 deletions
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index 4d71d9e..896bc16 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -1,4 +1,5 @@ AUX blt-2.4z-aclocal.patch 1705 SHA256 7b9b496f68ee8215b7404e1750955cb03e9188d19a523495c5ac33074500fc7e SHA512 dfc4eb375b12d8ae87a65c039bae6445b70008ff1681cf1a40028a04685bbfcbb5dc841b25b475285679aac9303e0807f88c061f983a26a3de66fc1e1dc2ad12 WHIRLPOOL 824a80c2b05ab023c5a4e5321aa29ea793212db311ffa817f2fb6b711480561fd226a6e3d0341c00e90dd8ec2b8d9b31d9a57935e9a8b49d07380560d4288aeb +AUX blt-2.4z-ar-withval.patch 1364 SHA256 b2b0a0df4ab4f517b366e864b8a69d50917c11e6b80bc764795424f510a59c99 SHA512 88833412b1cfd9d38b6571f9e879bc731ffbfa67c7d9e1fee646122b41d963f3cce0206f798bbbc11823fa428461f1653c4b1ddfae8dfc917abd947d5f59c647 WHIRLPOOL c1f56e4cc39f80631e1c01fe6880f17220e6429297687c3194caa9b9458a101f78fb16321f8b8dbbf9012caa7011b2012a11cbc3bfde13def4e1ccd69f0f5e23 AUX blt-2.4z-darwin.patch 1186 SHA256 3cbdbbf123aeb4b4a727704c2daabddb7a4a44e23c2d0bd7652c0b0b0aa8d297 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5 WHIRLPOOL 33a3fce0e6066e975ee2d564ae7176cfb4220f3371576531e4be3821a7cc43c96cd80892bb138006f5ce4dc38e1c970e68640b0e565a45634cc12427454730ac AUX blt-2.4z-deprecated-ac-output.patch 881 SHA256 746a12a929178259b367dbd129eec902055a61e30ddee76195174c29f9376269 SHA512 c90154c39a58d4a6b4957ba275bff1910ebaa602006cd0b688da5ce68ec6165bd5fd86420e6d2382759a9a6aaf31fc9ef98e762bac40c08ae4a0bd6fa27c23ca WHIRLPOOL f672c3bcf45b93e2b51804d32d1c89f92216d60d9e65f634a75e6495941f29896428d38f39ac16030bf2c19971e04ac2e6484a137598d881868cf3432fc5a39d AUX blt-2.4z-gbsd.patch 1980 SHA256 b020b0043847bc05bda1b5c4c96c888dc0075ba3ef397bbb4af8181c20c69ce9 SHA512 9e3b833445f998af5c070d755c4c6904d78175640b771abc020289c857bb12ab82fdd504eebc16771c3b057b94643d20acf4eb5952184ca2d2f9233ecd55f92c WHIRLPOOL f2c43489ee0edf9fda259e4d9f03deac98432ece74fb01c9d97ef2b294d0d52b86d7601a754e004b859a0f0965a403ff98f657f360a06b07b75a51f72872da6a @@ -16,6 +17,6 @@ AUX blt2.4z-64bit.patch 891 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b AUX blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 SHA512 2786eb7d59ef4f3e0b2e846f906e6f92cece13b8003ed220ddcdd22b42b761fa6aa31905a3a62af54e02db96bda37e21fae2361589d8c393586c37bcd33ef842 WHIRLPOOL a0db9fdc9d2199ac0e217015826a0ffe7b70c619e55e85a13a941202be3a325356cde627714d16d315f1647b5f95d16a6219720048b14560fdf7445c170995b2 AUX pkgIndex.tcl 146 SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d SHA512 fedb327153b670f370773c1b57f7f831c291962fb375e27ba0b31314a94128edc7a4e6b9377e7c19426beb672fcb9b1b10f7e45ca0f197e19863b40d27bef439 WHIRLPOOL b3f6534323e28097656cfd2ff42433e07460d6dc3b247ed666712b7e664e086421640ff2320e8d71e5037e07fcefd690b845c9dd08e54baf0562c8659919bc6d DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16 SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a WHIRLPOOL a00a029e075916dd7656ca85acb308a48e6d80563a91ada9e9e7df7518ef0d4de2200b54e5d9c8a9602520c03472e73968956c0df30afb8ef7f7b364fdd5524f -EBUILD blt-2.4z-r13.ebuild 3493 SHA256 f23fe1236f76cd1edc8417aa6d99d947293254ac1590b6b38cce0ea532b5f1ff SHA512 5292ff223c54ecc33187ce359fd80929b05c8a617c3813bcf8f128a4619a513cc9c8193695cb214720bd04e68cedd44a89917602945f42ab963858307eb3009c WHIRLPOOL 3c737471033cf16b632594f7346eebdca1b65b6380c2406c27d4fad6f8321ca8861f9af3b932b6c57d75107c8a553d22460ec4d43daac5e976773717234a33f8 +EBUILD blt-2.4z-r13.ebuild 3493 SHA256 5fe71fdb999b34b74524fe5bae23e51c69d3dcac3f3bc461295e898ea7b4cf37 SHA512 2a70accf204227e1efd5f626c89b005468856325800f30049e3bd9926597789d23791d423d361f00086522f19dd2c20d6fb868487948fae2e96d01f383be4a48 WHIRLPOOL 82b50fab31fee2a3a5eef3fa5f058e864fb89cadbdee92f026c805777c25d8077ff658b276bea7ad60b94b0206e9a7886fbb401e73897cb37d1a0973e8c11bd9 MISC ChangeLog 9103 SHA256 a0c8bf63e3325dbfc6ac1c0c18b6499c02c3739720ccfe19096a38ca5647b122 SHA512 0997e28c1b3f9a166ba6c94baba7a1e1aa043901251b83d8dd42edbe9d21b7ffe8a19d3a1f555c55f2a8959239c4d3b3fb1693598610428516e7742171fc61e2 WHIRLPOOL 10be00d2671bfade334975ce2405b8eac227aa88c0843fe7bc17fc47b7dfa715166ef58d602d3bd519079c86fd863aa1d5d199cd3875b793018869368239630c MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365 diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild index a39703f..715b4b4 100644 --- a/dev-tcltk/blt/blt-2.4z-r13.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild @@ -48,10 +48,6 @@ src_prepare() { -e 's:LD_RUN_PATH=.*$:LD_RUN_PATH="":g' \ -i configure* || die "sed configure* failed" - sed \ - -e "/AR/s:ar:$(tc-getAR):g" \ - -i src/Makefile.in || die - epatch \ "${FILESDIR}"/${P}-linking.patch \ "${FILESDIR}"/${P}-darwin.patch \ @@ -60,7 +56,8 @@ src_prepare() { "${FILESDIR}"/${P}-tcl8.6.patch \ "${FILESDIR}"/${P}-aclocal.patch \ "${FILESDIR}"/${P}-deprecated-ac-output.patch \ - "${FILESDIR}"/${P}-gentoo-libdir.patch + "${FILESDIR}"/${P}-gentoo-libdir.patch \ + "${FILESDIR}"/${P}-ar-withval.patch append-cflags -fPIC @@ -83,6 +80,7 @@ src_configure() { --with-tklibs="${EPREFIX}/usr/$(get_libdir)" \ --with-gentoo-libdir="$(get_libdir)" \ --with-cc="$(tc-getCC)" \ + --with-ar="$(tc-getAR)" \ --with-cflags="${CFLAGS}" \ --with-gnu-ld \ $(use_enable jpeg) \ diff --git a/dev-tcltk/blt/files/blt-2.4z-ar-withval.patch b/dev-tcltk/blt/files/blt-2.4z-ar-withval.patch new file mode 100644 index 0000000..bfd5fdb --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.4z-ar-withval.patch @@ -0,0 +1,41 @@ +diff -urpN blt2.4z-8.5.2.orig/configure.in blt2.4z-8.5.2/configure.in +--- blt2.4z-8.5.2.orig/configure.in 2013-12-31 09:48:06.356979323 -0800 ++++ blt2.4z-8.5.2/configure.in 2013-12-31 09:49:33.269046697 -0800 +@@ -36,6 +36,7 @@ blt_with_tk_includes="" + blt_with_tk_libraries="" + blt_with_scriptdir="" + blt_with_gentoo_libdir="lib" ++blt_with_ar="ar" + + AC_ARG_WITH(blt, [ --with-blt=DIR Install BLT scripts in DIR], + blt_with_scriptdir=$withval) +@@ -66,6 +67,8 @@ AC_ARG_WITH(cflags, [ --with-cflags=FLA + blt_with_gnu_ld="yes") + AC_ARG_WITH(gentoo_libdir, [ --with-gentoo-libdir=GENTOOLIBDIR dirty hack], + blt_with_gentoo_libdir=$withval) ++AC_ARG_WITH(ar, [ --with-ar Use GNU ar program], ++ blt_with_ar=$withval) + + AC_CANONICAL_SYSTEM + AC_PREFIX_PROGRAM(wish) +@@ -1354,6 +1357,8 @@ fi + GENTOO_LIBDIR=${gentoo_libdir} + AC_SUBST(GENTOO_LIBDIR) + ++AR=${blt_with_ar} ++AC_SUBST(AR) + + LIBS=${LIB_SPECS} + AC_SUBST(LIB_SPECS) +diff -urpN blt2.4z-8.5.2.orig/src/Makefile.in blt2.4z-8.5.2/src/Makefile.in +--- blt2.4z-8.5.2.orig/src/Makefile.in 2008-04-15 08:31:26.000000000 -0700 ++++ blt2.4z-8.5.2/src/Makefile.in 2013-12-31 09:49:33.268046638 -0800 +@@ -146,7 +146,7 @@ INSTALL_DATA = @INSTALL_DATA@ + INSTALL_ROOT = + RANLIB = @RANLIB@ + SHELL = /bin/sh +-AR = ar rc ++AR = @AR@ rc + RM = rm -f + LINT = lint + LINTFLAGS = -axhbns |