Date: Fri, 25 Apr 2014 12:27:26 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: freebsd-ports-bugs@FreeBSD.org, gnome@FreeBSD.org Subject: Re: ports/188978: [patch] Mk/bsd.gnome.mk: remove USE_GNOME=lthack Message-ID: <20140425102726.GE38988@ivaldir.etoilebsd.net> In-Reply-To: <201404242220.s3OMK4Su070383@freefall.freebsd.org> References: <201404242220.s3OMK4Su070383@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--vJguvTgX93MxBIIe
Content-Type: multipart/mixed; boundary="vA66WO2vHvL/CRSR"
Content-Disposition: inline
--vA66WO2vHvL/CRSR
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
libxslt has part has been committed
here is an updated version of the patch that removes the ltasneededhack as well:
it is not in use anymore.
regards,
Bapt
--vA66WO2vHvL/CRSR
Content-Type: text/x-diff; charset=iso-8859-1
Content-Disposition: attachment; filename="lthack.diff"
Content-Transfer-Encoding: quoted-printable
Index: Mk/bsd.gnome.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.gnome.mk (r=E9vision 352085)
+++ Mk/bsd.gnome.mk (copie de travail)
@@ -68,7 +68,7 @@
#
=20
# non-version specific components
-_USE_GNOME_ALL=3D esound intlhack intltool introspection ltasneededhack lt=
hack \
+_USE_GNOME_ALL=3D esound intlhack intltool introspection \
ltverhack gnomehack referencehack gnomehier gnomemimedata \
gnomeprefix
=20
@@ -116,9 +116,6 @@
referencehack_PRE_PATCH=3D ${FIND} ${WRKSRC} -name "Makefile.in" -type f |=
${XARGS} ${REINPLACE_CMD} -e \
"s|test \"\$$\$$installfiles\" =3D '\$$(srcdir)/html/\*'|:|"
=20
-lthack_PRE_PATCH=3D ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS}=
${REINPLACE_CMD} -e \
- '/^LIBTOOL_DEPS=3D"$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltco=
nfig $$LIBTOOL_DEPS;|'
-
GNOME_MTREE_FILE?=3D ${LOCALBASE}/etc/mtree/BSD.gnome.dist
gnomehier_DETECT=3D ${GNOME_MTREE_FILE}
gnomehier_RUN_DEPENDS=3D ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
@@ -704,10 +701,6 @@
/^LIBTOOL=3D/s|$$(top_builddir)/libtool|${WRKDIR}/gnome-libtool|g' \
${PATCH_WRKSRC}/$$file; \
done;
-.else
-. if ${USE_GNOME:Mltasneededhack}!=3D""
-IGNORE=3D cannot install: ${PORTNAME} uses the ltasneededhack GNOME compon=
ent but does not use libtool
-. endif
.endif
=20
.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}=3D=3D""
@@ -736,15 +729,6 @@
fi; \
done
=20
-ltasneededhack_PATCH_DEPENDS=3D${LIBTOOL_DEPENDS}
-ltasneededhack_PRE_PATCH=3D \
- if [ -f ${WRKDIR}/gnome-libtool ]; then \
- ${REINPLACE_CMD} -e \
- '/^archive_cmds=3D/s/-shared/-shared -Wl,--as-needed/ ; \
- /^archive_expsym_cmds=3D/s/-shared/-shared -Wl,--as-needed/' \
- ${WRKDIR}/gnome-libtool; \
- fi
-
# Set USE_CSTD for all ports that depend on glib12
.if defined(_USE_GNOME) && !empty(_USE_GNOME:Mglib12)
USE_CSTD=3D gnu89
@@ -754,10 +738,6 @@
# exist in ${_USE_GNOME} and set variables accordingly
.ifdef _USE_GNOME
=20
-. if ${USE_GNOME:Mltasneededhack}!=3D ""
-_GNOME_NEED_LIBTOOL=3D1
-. endif
-
# this is splitted out from the above entry because fmake trows a fit othe=
rwise
. if defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*}
. if ${USE_GNOME:Mltverhack*}!=3D ""
Index: Mk/bsd.mate.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Mk/bsd.mate.mk (r=E9vision 352085)
+++ Mk/bsd.mate.mk (copie de travail)
@@ -42,7 +42,7 @@
#
=20
# non-version specific components. Do not use :build/:run on those.
-_USE_MATE_ALL=3D autogen intlhack intltool ltasneededhack lthack ltverhack
+_USE_MATE_ALL=3D autogen intlhack intltool ltverhack
# These *hack* tools are the same as in bsd.gnome.mk but are run in
# pre-configure because pre-patch is when we run autogen.sh.
=20
@@ -57,9 +57,6 @@
=20
SCROLLKEEPER_DIR=3D /var/db/rarian
=20
-lthack_PRE_PATCH=3D ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS}=
${REINPLACE_CMD} -e \
- '/^LIBTOOL_DEPS=3D"$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltco=
nfig $$LIBTOOL_DEPS;|'
-
caja_DETECT=3D ${LOCALBASE}/libdata/pkgconfig/libcaja-extension.pc
caja_BUILD_DEPENDS=3D ${caja_DETECT}:${PORTSDIR}/x11-fm/mate-file-manager
caja_LIB_DEPENDS=3D libcaja-extension.so:${PORTSDIR}/x11-fm/mate-file-mana=
ger
@@ -188,10 +185,6 @@
/^LIBTOOL=3D/s|$$(top_builddir)/libtool|${WRKDIR}/mate-libtool|g'=
\
${PATCH_WRKSRC}/$$file; \
done;
-.else
-. if ${USE_MATE:Mltverhack*}!=3D"" || ${USE_MATE:Mltasneededhack}!=3D""
-IGNORE=3D cannot install: ${PORTNAME} uses the ltverhack and/or ltasneeded=
hack MATE components but does not use libtool
-. endif
.endif
=20
.if ${USE_MATE:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}=3D=3D""
@@ -209,15 +202,6 @@
fi; \
done
=20
-ltasneededhack_PATCH_DEPENDS=3D${LIBTOOL_DEPENDS}
-ltasneededhack_PRE_PATCH=3D if [ -f ${WRKDIR}/mate-libtool ]; then \
- ${REINPLACE_CMD} -e \
- '/^archive_cmds=3D/s/-shared/-shared -Wl,--as-needed/ ; \
- /^archive_expsym_cmds=3D/s/-shared/-shared -Wl,--as-needed/' \
- ${WRKDIR}/mate-libtool; \
- fi
-
-
# Comparing between USE_MATE and _USE_MATE_ALL to make sure the component
# exists in _USE_MATE_ALL. If it does not exist then give an error about i=
t.
#. for component in ${USE_MATE:O:u:C/^([^:]+).*/\1/}
@@ -228,7 +212,7 @@
. endif
. endfor
=20
-. if ${USE_MATE:Mltverhack*}!=3D "" || ${USE_MATE:Mltasneededhack}!=3D ""
+. if ${USE_MATE:Mltverhack*}!=3D ""
MATE_PRE_PATCH+=3D ${lthacks_PRE_PATCH}
CONFIGURE_ENV+=3D ${lthacks_CONFIGURE_ENV}
. endif
--vA66WO2vHvL/CRSR--
--vJguvTgX93MxBIIe
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlNaOI4ACgkQ8kTtMUmk6Ez4jQCdGPTLuvNaziueWCGrJK+2pHYW
VK4AniuFro28mdoP6Z7n1ya15Q5+YJ1m
=1a9m
-----END PGP SIGNATURE-----
--vJguvTgX93MxBIIe--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140425102726.GE38988>