summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2014-04-26 05:40:06 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2014-04-26 05:40:06 +0800
commitc79cb45938d101a0d74516a1ceac2e66fd407d2b (patch)
treed48dabfc12e4a1d466a7e1118f191c8940525ae0
parent11f3ac41d7e5988d0411cea79f7239bfbcba53e7 (diff)
downloadmarcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.tar
marcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.tar.gz
marcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.tar.bz2
marcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.tar.lz
marcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.tar.xz
marcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.tar.zst
marcuscom-ports-c79cb45938d101a0d74516a1ceac2e66fd407d2b.zip
Remove lthack and ltasneededhack, apart from one port which should be fixed
soon, there aren't any users left. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19576 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--Mk/bsd.gnome.mk22
1 files changed, 1 insertions, 21 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 09ca13b44..fd31215fe 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -68,7 +68,7 @@ Gnome_Pre_Include= bsd.gnome.mk
#
# non-version specific components
-_USE_GNOME_ALL= esound intlhack intltool introspection ltasneededhack lthack \
+_USE_GNOME_ALL= esound intlhack intltool introspection \
ltverhack gnomehack referencehack gnomehier gnomemimedata \
gnomeprefix
@@ -118,9 +118,6 @@ gnomehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "${GNOME_MAKEFILEIN}*" -type f | ${
referencehack_PRE_PATCH= ${FIND} ${WRKSRC} -name "Makefile.in" -type f | ${XARGS} ${REINPLACE_CMD} -e \
"s|test \"\$$\$$installfiles\" = '\$$(srcdir)/html/\*'|:|"
-lthack_PRE_PATCH= ${FIND} ${WRKSRC} -name "configure" -type f | ${XARGS} ${REINPLACE_CMD} -e \
- '/^LIBTOOL_DEPS="$$ac_aux_dir\/ltmain.sh"$$/s|$$|; $$ac_aux_dir/ltconfig $$LIBTOOL_DEPS;|'
-
GNOME_MTREE_FILE?= ${LOCALBASE}/etc/mtree/BSD.gnome.dist
gnomehier_DETECT= ${GNOME_MTREE_FILE}
gnomehier_RUN_DEPENDS= ${gnomehier_DETECT}:${PORTSDIR}/misc/gnomehier
@@ -717,10 +714,6 @@ lthacks_PRE_PATCH= \
/^LIBTOOL=/s|$$(top_builddir)/libtool|${WRKDIR}/gnome-libtool|g' \
${PATCH_WRKSRC}/$$file; \
done;
-.else
-. if ${USE_GNOME:Mltasneededhack}!=""
-IGNORE= cannot install: ${PORTNAME} uses the ltasneededhack GNOME component but does not use libtool
-. endif
.endif
.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}==""
@@ -749,15 +742,6 @@ ltverhack_PRE_PATCH= \
fi; \
done
-ltasneededhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS}
-ltasneededhack_PRE_PATCH= \
- if [ -f ${WRKDIR}/gnome-libtool ]; then \
- ${REINPLACE_CMD} -e \
- '/^archive_cmds=/s/-shared/-shared -Wl,--as-needed/ ; \
- /^archive_expsym_cmds=/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= gnu89
@@ -767,10 +751,6 @@ USE_CSTD= gnu89
# exist in ${_USE_GNOME} and set variables accordingly
.ifdef _USE_GNOME
-. if ${USE_GNOME:Mltasneededhack}!= ""
-_GNOME_NEED_LIBTOOL=1
-. endif
-
# this is splitted out from the above entry because fmake trows a fit otherwise
. if defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*}
. if ${USE_GNOME:Mltverhack*}!= ""