[108153] trunk/base

cal at macports.org cal at macports.org
Sun Jul 14 14:22:40 PDT 2013 

Revision: 108153
          https://trac.macports.org/changeset/108153
Author:   cal at macports.org
Date:     2013-07-14 14:22:40 -0700 (Sun, 14 Jul 2013)
Log Message:
-----------
pextlib1.0: avoid warning about empty strlcat.c on systems with strlcat

configure.ac/configure:
 - Export result of AC_CHECK_FUNC([strlcat]) for src/pextlib1.0/Makefile.in
 - Sort AC_CONFIG_FILES
 - Add src/pextlib1.0/Makefile.in to AC_CONFIG_FILES
pextlib1.0/Makefile:
 - Move to Makefile.in
 - use result of AC_CHECK_FUNC([strlcat]) to enable compilation of strlcat.c.
 - move registry.dylib to LIBS rather than OBJS to avoid cleaning it

Modified Paths:
--------------
    trunk/base/configure
    trunk/base/configure.ac

Added Paths:
-----------
    trunk/base/src/pextlib1.0/Makefile.in

Removed Paths:
-------------
    trunk/base/src/pextlib1.0/Makefile

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2013-07-14 11:39:40 UTC (rev 108152)
+++ trunk/base/configure	2013-07-14 21:22:40 UTC (rev 108153)
@@ -661,6 +661,7 @@
 READLINE_LIBS
 MD5_LIBS
 READLINK_IS_NOT_P1003_1A
+ac_cv_func_strlcat
 CPP
 UNIVERSAL_ARCHS
 MPFRAMEWORKSDIR
@@ -8812,6 +8813,8 @@
 done
 
 
+
+
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if readlink conforms to POSIX 1003.1a" >&5
 $as_echo_n "checking if readlink conforms to POSIX 1003.1a... " >&6; }
 
@@ -10093,7 +10096,7 @@
 
 
 # Output
-ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/base.mtree doc/prefix.mtree doc/macosx.mtree doc/macports.conf doc/pubkeys.conf portmgr/freebsd/Makefile src/Makefile src/machista1.0/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry2.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
+ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/base.mtree doc/macosx.mtree doc/macports.conf doc/prefix.mtree doc/pubkeys.conf portmgr/freebsd/Makefile setupenv.bash src/Makefile src/machista1.0/Makefile src/macports1.0/macports_autoconf.tcl src/macports1.0/macports_fastload.tcl src/pextlib1.0/Makefile src/port1.0/port_autoconf.tcl src/programs/Makefile src/registry2.0/registry_autoconf.tcl"
 
 
 ac_config_files="$ac_config_files src/pkg_mkindex.sh"
@@ -10795,19 +10798,20 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "Mk/macports.autoconf.mk") CONFIG_FILES="$CONFIG_FILES Mk/macports.autoconf.mk" ;;
     "doc/base.mtree") CONFIG_FILES="$CONFIG_FILES doc/base.mtree" ;;
-    "doc/prefix.mtree") CONFIG_FILES="$CONFIG_FILES doc/prefix.mtree" ;;
     "doc/macosx.mtree") CONFIG_FILES="$CONFIG_FILES doc/macosx.mtree" ;;
     "doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
+    "doc/prefix.mtree") CONFIG_FILES="$CONFIG_FILES doc/prefix.mtree" ;;
     "doc/pubkeys.conf") CONFIG_FILES="$CONFIG_FILES doc/pubkeys.conf" ;;
     "portmgr/freebsd/Makefile") CONFIG_FILES="$CONFIG_FILES portmgr/freebsd/Makefile" ;;
+    "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/machista1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/machista1.0/Makefile" ;;
     "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
+    "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
+    "src/pextlib1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/pextlib1.0/Makefile" ;;
     "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
+    "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
     "src/registry2.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry2.0/registry_autoconf.tcl" ;;
-    "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
-    "src/macports1.0/macports_fastload.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_fastload.tcl" ;;
-    "setupenv.bash") CONFIG_FILES="$CONFIG_FILES setupenv.bash" ;;
     "src/pkg_mkindex.sh") CONFIG_FILES="$CONFIG_FILES src/pkg_mkindex.sh" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2013-07-14 11:39:40 UTC (rev 108152)
+++ trunk/base/configure.ac	2013-07-14 21:22:40 UTC (rev 108153)
@@ -244,6 +244,8 @@
 
 # Checks for library functions.
 AC_CHECK_FUNCS([bzero memset fgetln lockf flock setmode strcasecmp strncasecmp strlcpy strlcat copyfile clearenv sysctlbyname kqueue])
+AC_SUBST(ac_cv_func_strlcat)
+
 MP_CHECK_READLINK_IS_P1003_1A
 
 # Check for md5 implementation
@@ -385,19 +387,20 @@
 	Makefile
 	Mk/macports.autoconf.mk
 	doc/base.mtree
-	doc/prefix.mtree
 	doc/macosx.mtree
 	doc/macports.conf
+	doc/prefix.mtree
 	doc/pubkeys.conf
 	portmgr/freebsd/Makefile
+	setupenv.bash
 	src/Makefile
 	src/machista1.0/Makefile
 	src/macports1.0/macports_autoconf.tcl
+	src/macports1.0/macports_fastload.tcl
+	src/pextlib1.0/Makefile
 	src/port1.0/port_autoconf.tcl
+	src/programs/Makefile
 	src/registry2.0/registry_autoconf.tcl
-	src/programs/Makefile
-	src/macports1.0/macports_fastload.tcl
-	setupenv.bash
 ])
 
 AC_CONFIG_FILES([src/pkg_mkindex.sh], [chmod +x src/pkg_mkindex.sh])

Deleted: trunk/base/src/pextlib1.0/Makefile
===================================================================
--- trunk/base/src/pextlib1.0/Makefile	2013-07-14 11:39:40 UTC (rev 108152)
+++ trunk/base/src/pextlib1.0/Makefile	2013-07-14 21:22:40 UTC (rev 108153)
@@ -1,28 +0,0 @@
-OBJS= \
-	Pextlib.o strsed.o fgetln.o md5cmd.o setmode.o xinstall.o \
-	fs-traverse.o strcasecmp.o vercomp.o filemap.o base32cmd.o \
-	sha1cmd.o curl.o rmd160cmd.o sha256cmd.o readline.o uid.o \
-	tracelib.o tty.o readdir.o pipe.o flock.o strlcat.o \
-	system.o mktemp.o realpath.o ../registry2.0/registry${SHLIB_SUFFIX}
-SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
-
-include ../../Mk/macports.autoconf.mk
-include ../../Mk/macports.tea.mk
-
-CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
-LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS}
-ifeq ($(shell uname), Darwin)
-	SHLIB_LDFLAGS+= -install_name ${datadir}/macports/Tcl/pextlib1.0/${SHLIB_NAME}
-endif
-
-.PHONY: test
-
-test:: ${SHLIB_NAME}
-	${TCLSH} tests/checksums.tcl ./${SHLIB_NAME}
-	${TCLSH} tests/curl.tcl ./${SHLIB_NAME}
-	${TCLSH} tests/filemap.tcl ./${SHLIB_NAME}
-	${TCLSH} tests/fs-traverse.tcl ./${SHLIB_NAME}
-	${TCLSH} tests/symlink.tcl ./${SHLIB_NAME}
-	${TCLSH} tests/unsetenv.tcl ./${SHLIB_NAME}
-	${TCLSH} tests/vercomp.tcl ./${SHLIB_NAME}

Added: trunk/base/src/pextlib1.0/Makefile.in
===================================================================
--- trunk/base/src/pextlib1.0/Makefile.in	                        (rev 0)
+++ trunk/base/src/pextlib1.0/Makefile.in	2013-07-14 21:22:40 UTC (rev 108153)
@@ -0,0 +1,32 @@
+OBJS= \
+	Pextlib.o strsed.o fgetln.o md5cmd.o setmode.o xinstall.o \
+	fs-traverse.o strcasecmp.o vercomp.o filemap.o base32cmd.o \
+	sha1cmd.o curl.o rmd160cmd.o sha256cmd.o readline.o uid.o \
+	tracelib.o tty.o readdir.o pipe.o flock.o system.o \
+	mktemp.o realpath.o
+ifneq (@ac_cv_func_strlcat@,yes)
+	OBJS+=strlcat.o
+endif
+
+SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
+
+include ../../Mk/macports.autoconf.mk
+include ../../Mk/macports.tea.mk
+
+CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
+LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS} ../registry2.0/registry${SHLIB_SUFFIX}
+ifeq ($(shell uname), Darwin)
+	SHLIB_LDFLAGS+= -install_name ${datadir}/macports/Tcl/pextlib1.0/${SHLIB_NAME}
+endif
+
+.PHONY: test
+
+test:: ${SHLIB_NAME}
+	${TCLSH} tests/checksums.tcl ./${SHLIB_NAME}
+	${TCLSH} tests/curl.tcl ./${SHLIB_NAME}
+	${TCLSH} tests/filemap.tcl ./${SHLIB_NAME}
+	${TCLSH} tests/fs-traverse.tcl ./${SHLIB_NAME}
+	${TCLSH} tests/symlink.tcl ./${SHLIB_NAME}
+	${TCLSH} tests/unsetenv.tcl ./${SHLIB_NAME}
+	${TCLSH} tests/vercomp.tcl ./${SHLIB_NAME}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130714/4f720f34/attachment.html>

More information about the macports-changes mailing list