Subject: mk/gnu-config question/request
To: None <tech-pkg@netbsd.org>
From: Jeroen Ruigrok/asmodai <asmodai@in-nomine.org>
List: tech-pkg
Date: 06/12/2005 00:29:42
--M9NhX3UHpAaciwkO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Can someone please update the stale files in this directory?

There's almost a year difference between config.guess there and the latest
project's CVS entry and a year and a quarter for config.sub.
(See: anoncvs@savannah.gnu.org:/cvsroot/config)

Does it make sense to keep config.guess/config.sub there instead of pulling
it from pkg/share/autoconf/?  Also, if mk/gnu-config is retained, shouldn't
ltmain.sh be added there as well?  It is as vital to correct handling of
autotools based programs as config.guess/sub, otherwise shared linking will
most likely fail.

See attached patch for an example that will link ltmain.sh to the ltmain.sh
in the libtool share directory.  Only issue outstanding is making sure
aclocal is run if aclocal.m4 exists, followed by autoheader --force and
autoconf --force.  This is the only way to force a given package to enable
creation of shared libraries.  A problem I am encountering frequently with
ports of software using outdated versions/files of the autotools.

Opinions/comments and the like welcomed, since I think we need to change
some of these infrastructure points a bit more.  I like a lot of the current
tool wrapping of pkgsrc though.

-- 
Jeroen Ruigrok van der Werven <asmodai(at)wxs.nl> / asmodai / kita no mono
Free Tibet! http://www.savetibet.org/ | http://ashemedai.deviantart.com/
http://www.tendra.org/   | http://www.in-nomine.org/
When you are right, you cannot be too radical; When you are wrong, you
cannot be too conservative.

--M9NhX3UHpAaciwkO
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bsd.pkg.mk.diff"

Index: mk/bsd.pkg.mk
===================================================================
RCS file: /home/ncvs/NetBSD/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1687
diff -u -r1.1687 bsd.pkg.mk
--- mk/bsd.pkg.mk	4 Jun 2005 20:56:47 -0000	1.1687
+++ mk/bsd.pkg.mk	11 Jun 2005 22:16:34 -0000
@@ -739,6 +739,8 @@
 #
 CONFIG_STATUS_OVERRIDE?=	\
 	config.status */config.status */*/config.status
+LTMAIN_OVERRIDE?=		\
+	ltmain.sh */ltmain.sh */*/ltmain.sh
 .endif
 
 #
@@ -1745,6 +1747,24 @@
 .  endfor
 .endif
 
+.if defined(USE_LIBTOOL)
+_CONFIGURE_PREREQ+=	do-ltmain-override
+.PHONY: do-ltmain-override
+do-ltmain-override:
+.  if !empty(LTMAIN_OVERRIDE)
+.    for _pattern_ in ${LTMAIN_OVERRIDE}
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};
+	for file in ${_pattern_}; do					\
+		if [ -f "$$file" ]; then				\
+			${RM} -f $$file;				\
+			${LN} -s ${LOCALBASE}/share/libtool/ltmain.sh	\
+				$$file;					\
+		fi;							\
+	done
+.    endfor
+.  endif
+.endif
+
 _CONFIGURE_PREREQ+=	do-config-star-override
 .PHONY: do-config-star-override
 do-config-star-override:

--M9NhX3UHpAaciwkO--