Date: Thu, 11 Sep 2003 11:31:17 +0400 From: Sergey Akifyev <asa@gascom.ru> To: FreeBSD GNOME Users <gnome@freebsd.org>, Joe Marcus Clarke <marcus@marcuscom.com> Subject: gcalctool build fails (at least on -STABLE) Message-ID: <1063265477.387.30.camel@asa.gascom.net.ru>
next in thread | raw e-mail | index | archive | help
--=-efJx3NP9AJqTQ58T5daZ
Content-Type: multipart/mixed; boundary="=-vsOgDaRhh5HQiu1uED3+"
--=-vsOgDaRhh5HQiu1uED3+
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Hello!
gcalctool fails on -STABLE, becaus of it's libtool trashes -pthread
flag. The included fix makes it use freebsd libtool. Please, review how
this works for -CURRENT.
[ Including attachment inline ]
diff -ruN gcalctool.orig/Makefile gcalctool/Makefile
--- gcalctool.orig/Makefile Thu Sep 11 09:34:12 2003
+++ gcalctool/Makefile Thu Sep 11 11:23:57 2003
@@ -23,6 +23,7 @@
USE_GNOME=3D gnomeprefix gnomehack libgnomeui
CONFIGURE_ENV=3D CPPFLAGS=3D"-I${LOCALBASE}/include" \
LDFLAGS=3D"-L${LOCALBASE}/lib"
+MAKE_ENV=3D LIBTOOL_FREEBSD=3D"${LIBTOOL}"
=
=20
post-patch:
@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
diff -ruN gcalctool.orig/files/patch-configure
gcalctool/files/patch-configure
--- gcalctool.orig/files/patch-configure Thu Jan 1 03:00:00 1970
+++ gcalctool/files/patch-configure Thu Sep 11 11:24:12 2003
@@ -0,0 +1,11 @@
+--- configure.orig Thu Sep 11 11:19:23 2003
++++ configure Thu Sep 11 11:20:33 2003
+@@ -10127,7 +10127,7 @@
+ LIBTOOL_DEPS=3D"$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL=3D'$(SHELL) $(top_builddir)/libtool'
++LIBTOOL=3D'$(SHELL) $(LIBTOOL_FREEBSD)'
+
+ # Prevent multiple expansion
+
--=20
regards,
Sergey Akifyev <asa@gascom.ru>
JSC Gascom <http://www.gascom.ru>;
PGP key available from:
ftp://ftp.gascom.ru/pub/PGP-keys/asa.txt
--=-vsOgDaRhh5HQiu1uED3+
Content-Disposition: attachment; filename=gcalctool.diff
Content-Type: text/x-patch; name=gcalctool.diff; charset=KOI8-R
Content-Transfer-Encoding: base64
ZGlmZiAtcnVOIGdjYWxjdG9vbC5vcmlnL01ha2VmaWxlIGdjYWxjdG9vbC9NYWtlZmlsZQ0KLS0t
IGdjYWxjdG9vbC5vcmlnL01ha2VmaWxlCVRodSBTZXAgMTEgMDk6MzQ6MTIgMjAwMw0KKysrIGdj
YWxjdG9vbC9NYWtlZmlsZQlUaHUgU2VwIDExIDExOjIzOjU3IDIwMDMNCkBAIC0yMyw2ICsyMyw3
IEBADQogVVNFX0dOT01FPQlnbm9tZXByZWZpeCBnbm9tZWhhY2sgbGliZ25vbWV1aQ0KIENPTkZJ
R1VSRV9FTlY9CUNQUEZMQUdTPSItSSR7TE9DQUxCQVNFfS9pbmNsdWRlIiBcDQogCQlMREZMQUdT
PSItTCR7TE9DQUxCQVNFfS9saWIiDQorTUFLRV9FTlY9CUxJQlRPT0xfRlJFRUJTRD0iJHtMSUJU
T09MfSINCiANCiBwb3N0LXBhdGNoOg0KIAlAJHtGSU5EfSAke1dSS1NSQ30gLW5hbWUgIiouW2No
XSIgfCAke1hBUkdTfSAke1JFSU5QTEFDRV9DTUR9IC1lIFwNCmRpZmYgLXJ1TiBnY2FsY3Rvb2wu
b3JpZy9maWxlcy9wYXRjaC1jb25maWd1cmUgZ2NhbGN0b29sL2ZpbGVzL3BhdGNoLWNvbmZpZ3Vy
ZQ0KLS0tIGdjYWxjdG9vbC5vcmlnL2ZpbGVzL3BhdGNoLWNvbmZpZ3VyZQlUaHUgSmFuICAxIDAz
OjAwOjAwIDE5NzANCisrKyBnY2FsY3Rvb2wvZmlsZXMvcGF0Y2gtY29uZmlndXJlCVRodSBTZXAg
MTEgMTE6MjQ6MTIgMjAwMw0KQEAgLTAsMCArMSwxMSBAQA0KKy0tLSBjb25maWd1cmUub3JpZwlU
aHUgU2VwIDExIDExOjE5OjIzIDIwMDMNCisrKysgY29uZmlndXJlCVRodSBTZXAgMTEgMTE6MjA6
MzMgMjAwMw0KK0BAIC0xMDEyNyw3ICsxMDEyNyw3IEBADQorIExJQlRPT0xfREVQUz0iJGFjX2F1
eF9kaXIvbHRtYWluLnNoIg0KKyANCisgIyBBbHdheXMgdXNlIG91ciBvd24gbGlidG9vbC4NCist
TElCVE9PTD0nJChTSEVMTCkgJCh0b3BfYnVpbGRkaXIpL2xpYnRvb2wnDQorK0xJQlRPT0w9JyQo
U0hFTEwpICQoTElCVE9PTF9GUkVFQlNEKScNCisgDQorICMgUHJldmVudCBtdWx0aXBsZSBleHBh
bnNpb24NCisgDQo=
--=-vsOgDaRhh5HQiu1uED3+--
--=-efJx3NP9AJqTQ58T5daZ
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQA/YCTEbu06QwmNwNsRAuwoAKCMzTZNhLFVyjsLwgJJUD/DdNCHDACfRF5N
MuaEGN+Ve9m88x6VOOVWNMU=
=07WL
-----END PGP SIGNATURE-----
--=-efJx3NP9AJqTQ58T5daZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1063265477.387.30.camel>