BSDBuild-SVN | 20 Jan 10:31
Favicon

BSDBuild: r935 - trunk/BSDBuild

Author: vedge
Date: 2012-01-20 04:31:32 -0500 (Fri, 20 Jan 2012)
New Revision: 935

Modified:
   trunk/BSDBuild/iconv.pm
Log:
fix -liconv test

Modified: trunk/BSDBuild/iconv.pm
===================================================================
--- trunk/BSDBuild/iconv.pm	2012-01-20 08:57:46 UTC (rev 934)
+++ trunk/BSDBuild/iconv.pm	2012-01-20 09:31:32 UTC (rev 935)
@@ -106,7 +106,7 @@
 		MkEndif;
 		MkCompileC('HAVE_ICONV', '${ICONV_CFLAGS} -Wno-cast-qual',
 		           '${ICONV_LIBS}', $testCode);
-		MkIfTrue('${HAVE_ICONV}');
+		MkIfFalse('${HAVE_ICONV}');
 			MkPrintN('checking for iconv() in -liconv (const)...');
 			MkCompileC('HAVE_ICONV', '${ICONV_CFLAGS} -Wno-cast-qual',
 			           '${ICONV_LIBS}', $testConstCode);
@@ -131,7 +131,7 @@

 BEGIN
 {
-	$DESCR{'iconv'} = 'iconv()';
+	$DESCR{'iconv'} = 'iconv() in libc';
 	$TESTS{'iconv'} = \&Test;
 	$DEPS{'iconv'} = 'cc';
(Continue reading)

BSDBuild-SVN | 20 Jan 09:57
Favicon

BSDBuild: r934 - trunk/BSDBuild

Author: vedge
Date: 2012-01-20 03:57:46 -0500 (Fri, 20 Jan 2012)
New Revision: 934

Modified:
   trunk/BSDBuild/cracklib.pm
Log:
look for <packer.h>

Modified: trunk/BSDBuild/cracklib.pm
===================================================================
--- trunk/BSDBuild/cracklib.pm	2012-01-20 08:28:03 UTC (rev 933)
+++ trunk/BSDBuild/cracklib.pm	2012-01-20 08:57:46 UTC (rev 934)
@@ -41,7 +41,7 @@
 		MkDefine('CRACKLIB_LIBS', "-L$pfx/lib -lcrack");
 	MkElse;
 		foreach my $dir (@autoPrefixDirs) {
-			MkIf("-f \"$dir/include/crack.h\"");
+			MkIf("-f \"$dir/include/packer.h\"");
 				MkDefine('CRACKLIB_CFLAGS', "-I$dir/include");
 				MkDefine('CRACKLIB_LIBS', "-L$dir/lib -lcrack");
 			MkEndif;
@@ -54,7 +54,7 @@
 		MkCompileC('HAVE_CRACKLIB', '${CRACKLIB_CFLAGS}', '${CRACKLIB_LIBS}',
 		    << 'EOF');
 #include <stdio.h>
-#include <crack.h>
+#include <packer.h>
 int main(int argc, char *argv[]) {
 	const char *msg = (const char *)FascistCheck("foobar", "/path");
(Continue reading)

BSDBuild-SVN | 20 Jan 09:23
Favicon

BSDBuild: r932 - in trunk: . man

Author: vedge
Date: 2012-01-20 03:23:59 -0500 (Fri, 20 Jan 2012)
New Revision: 932

Modified:
   trunk/man/mkconfigure.1
   trunk/mkconfigure.pl
Log:
implement CHECK_PERL_MODULE() and REQUIRE_PERL_MODULE().

Modified: trunk/man/mkconfigure.1
===================================================================
--- trunk/man/mkconfigure.1	2012-01-19 07:39:55 UTC (rev 931)
+++ trunk/man/mkconfigure.1	2012-01-20 08:23:59 UTC (rev 932)
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2007-2010 Hypertriton, Inc. <http://www.hypertriton.com/>
+.\" Copyright (c) 2007-2012 Hypertriton, Inc. <http://www.hypertriton.com/>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -241,6 +241,16 @@
 Same as
 .Ev CHECK_FUNCTION() ,
 except that the function is tested using the provided CFLAGS and LIBS.
+.It Ev CHECK_PERL_MODULE(modulename)
+Check that the specified Perl module is installed and functioning.
+For example, if
+.Fa modulename
+is "Time::Zone", the macro will set the variable "HAVE_TIME_ZONE"
(Continue reading)

BSDBuild-SVN | 19 Jan 08:39
Favicon

BSDBuild: r931 - trunk/BSDBuild

Author: vedge
Date: 2012-01-19 02:39:55 -0500 (Thu, 19 Jan 2012)
New Revision: 931

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
Log:
quote "$?" test

Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm	2012-01-19 07:34:26 UTC (rev 930)
+++ trunk/BSDBuild/cc.pm	2012-01-19 07:39:55 UTC (rev 931)
@@ -305,7 +305,7 @@
 	print << "EOF";
 \$LIBTOOL --quiet --mode=compile --tag=CC \$CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o
conftest.c 2>>config.log
 EOF
-	MkIf('$? == 0');
+	MkIf('"$?" = "0"');
 		MkPrint('yes');
 		MkDefine('LIBTOOLOPTS_CC', '--tag=CC');
 	MkElse;

Modified: trunk/BSDBuild/cxx.pm
===================================================================
--- trunk/BSDBuild/cxx.pm	2012-01-19 07:34:26 UTC (rev 930)
+++ trunk/BSDBuild/cxx.pm	2012-01-19 07:39:55 UTC (rev 931)
@@ -295,7 +295,7 @@
(Continue reading)

BSDBuild-SVN | 19 Jan 08:34
Favicon

BSDBuild: r930 - trunk/BSDBuild

Author: vedge
Date: 2012-01-19 02:34:26 -0500 (Thu, 19 Jan 2012)
New Revision: 930

Modified:
   trunk/BSDBuild/gettext.pm
Log:
fix confusing diagnostic message

Modified: trunk/BSDBuild/gettext.pm
===================================================================
--- trunk/BSDBuild/gettext.pm	2011-12-24 03:01:58 UTC (rev 929)
+++ trunk/BSDBuild/gettext.pm	2012-01-19 07:34:26 UTC (rev 930)
@@ -52,7 +52,7 @@

 	MkCompileC('HAVE_GETTEXT', '${GETTEXT_CFLAGS}', '${GETTEXT_LIBS}', $testCode);
 	MkIfFalse('${HAVE_GETTEXT}');
-		MkPrintN('checking whether gettext requires -lintl...');
+		MkPrintN('checking for a gettext library in -lintl...');
 		MkIfNE($pfx, '');
 			MkIfExists("$pfx/include/libintl.h");
 			    MkDefine('GETTEXT_CFLAGS', "-I$pfx/include");
@@ -95,7 +95,7 @@

 BEGIN
 {
-	$DESCR{'gettext'} = 'a gettext library';
+	$DESCR{'gettext'} = 'a gettext library in libc';
 	$TESTS{'gettext'} = \&Test;
 	$DEPS{'gettext'} = 'cc';
(Continue reading)

BSDBuild-SVN | 24 Dec 04:01
Favicon

BSDBuild: r929 - trunk/BSDBuild

Author: vedge
Date: 2011-12-23 22:01:58 -0500 (Fri, 23 Dec 2011)
New Revision: 929

Modified:
   trunk/BSDBuild/Builtins.pm
Log:
scan for "glibtool"; make sure ${LIBTOOL} is GNU libtool.

Modified: trunk/BSDBuild/Builtins.pm
===================================================================
--- trunk/BSDBuild/Builtins.pm	2011-12-19 03:42:59 UTC (rev 928)
+++ trunk/BSDBuild/Builtins.pm	2011-12-24 03:01:58 UTC (rev 929)
@@ -148,6 +148,10 @@
 else
 	LIBTOOL=""
 	for path in `echo $PATH | sed 's/:/ /g'`; do
+		if [ -x "${path}/glibtool" ]; then
+			LIBTOOL="${path}/glibtool"
+			break
+		fi
 		if [ -x "${path}/libtool" ]; then
 			LIBTOOL="${path}/libtool"
 			break
@@ -157,7 +161,12 @@
 		LIBTOOL_BUNDLED="yes"
 		LIBTOOL=\${TOP}/mk/libtool/libtool
 	else
-		LIBTOOL_BUNDLED="no"
+		if [ "`libtool --version |grep GNU`" = "" ]; then
(Continue reading)

BSDBuild-SVN | 19 Dec 04:27
Favicon

BSDBuild: r927 - trunk/BSDBuild

Author: vedge
Date: 2011-12-18 22:27:41 -0500 (Sun, 18 Dec 2011)
New Revision: 927

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
Log:
fix test for libtool --tag

Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm	2011-12-11 06:02:48 UTC (rev 926)
+++ trunk/BSDBuild/cc.pm	2011-12-19 03:27:41 UTC (rev 927)
@@ -303,7 +303,7 @@
 	print 'cat << EOT > conftest.c', "\n",
 	      'int main(int argc, char *argv[]) { return (0); }', "\nEOT\n";
 	print << "EOF";
-\$LIBTOOL --quiet --mode=compile \$CC --tag=CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o
conftest.c 2>>config.log
+\$LIBTOOL --quiet --mode=compile --tag=CC \$CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o
conftest.c 2>>config.log
 EOF
 	MkIf('$? == 0');
 		MkPrint('yes');

Modified: trunk/BSDBuild/cxx.pm
===================================================================
--- trunk/BSDBuild/cxx.pm	2011-12-11 06:02:48 UTC (rev 926)
+++ trunk/BSDBuild/cxx.pm	2011-12-19 03:27:41 UTC (rev 927)
(Continue reading)

BSDBuild-SVN | 19 Dec 04:42
Favicon

BSDBuild: r928 - trunk

Author: vedge
Date: 2011-12-18 22:42:59 -0500 (Sun, 18 Dec 2011)
New Revision: 928

Modified:
   trunk/build.lib.mk
Log:
work around more libtool "--tag=CC" stupidity

Modified: trunk/build.lib.mk
===================================================================
--- trunk/build.lib.mk	2011-12-19 03:27:41 UTC (rev 927)
+++ trunk/build.lib.mk	2011-12-19 03:42:59 UTC (rev 928)
@@ -244,27 +244,27 @@
                 done; \
 	    	if [ "${LIB_SHARED}" = "Yes" ]; then \
 	    	    if [ "${LIB_MODULE}" = "Yes" ]; then \
-	                echo "${LIBTOOL} ${LIBTOOLOPTS} --mode=link \
+	                echo "${LIBTOOL} ${LIBTOOLOPTS} ${LIBTOOLOPTS_CC} --mode=link \
 			    ${CC} -o lib${LIB}.la \
 			    -module \
 		            -rpath ${PREFIX}/lib \
 	                    -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \
 		            ${LDFLAGS} $$_shobjs \
 		            ${LIBS} ${LIB_XOBJS}"; \
-	                ${LIBTOOL} ${LIBTOOLOPTS} --mode=link \
+	                ${LIBTOOL} ${LIBTOOLOPTS} ${LIBTOOLOPTS_CC} --mode=link \
 			    ${CC} -o lib${LIB}.la -module \
 		            -rpath ${PREFIX}/lib \
 		            -version-info ${LIB_MAJOR}:${LIB_MINOR}:0 \
(Continue reading)

BSDBuild-SVN | 11 Dec 07:02
Favicon

BSDBuild: r926 - trunk

Author: vedge
Date: 2011-12-11 01:02:48 -0500 (Sun, 11 Dec 2011)
New Revision: 926

Modified:
   trunk/uman.pl
Log:
invoke groff directly and pass -P-c

Modified: trunk/uman.pl
===================================================================
--- trunk/uman.pl	2011-12-11 04:03:16 UTC (rev 925)
+++ trunk/uman.pl	2011-12-11 06:02:48 UTC (rev 926)
@@ -15,7 +15,8 @@
 @SRC_DIRS = split(':', $ENV{'UMANPATH'});

 # Formatting engine
-$NROFF = 'nroff -Tascii -mandoc';
+#$NROFF = 'nroff -Tascii -mandoc';
+$NROFF = 'groff -S -P-h -Wall -mtty-char -man -Tascii -P-c -mandoc';

 if (@ARGV < 1) { die "Usage: aman [manpage]"; }
 my $query = $ARGV[0];
BSDBuild-SVN | 11 Dec 05:03
Favicon

BSDBuild: r925 - trunk

Author: vedge
Date: 2011-12-10 23:03:16 -0500 (Sat, 10 Dec 2011)
New Revision: 925

Modified:
   trunk/build.man.mk
Log:
in install-man target, use "${SUDO} env ..." instead of "env ... ${SUDO}",
since sudo may clear the environment.

Modified: trunk/build.man.mk
===================================================================
--- trunk/build.man.mk	2011-12-11 02:40:02 UTC (rev 924)
+++ trunk/build.man.mk	2011-12-11 04:03:16 UTC (rev 925)
@@ -367,99 +367,99 @@

 install-man:
 	@if [ "${MAN1}" != "" -a "${NOMAN}" != "yes" ]; then \
-	    env MAN="${MAN1}" CATMAN="${CATMAN1}" NOCATMAN="${NOCATMAN}" \
+	    ${SUDO} env MAN="${MAN1}" CATMAN="${CATMAN1}" NOCATMAN="${NOCATMAN}" \
 	        INSTALL_DATA="${INSTALL_DATA}" \
 		MANDIR="${DESTDIR}${MANDIR}/man1" \
 	        CATMANDIR="${DESTDIR}${MANDIR}/cat1" \
-	        ${SUDO} ${SH} ${TOP}/mk/install-manpages.sh; \
+	        ${SH} ${TOP}/mk/install-manpages.sh; \
 	    if [ $$? != 0 ]; then \
 	    	echo "install-manpages.sh failed"; \
 		exit 1; \
 	    fi; \
 	fi
(Continue reading)

BSDBuild-SVN | 11 Dec 03:40
Favicon

BSDBuild: r924 - in trunk: . BSDBuild man

Author: vedge
Date: 2011-12-10 21:40:02 -0500 (Sat, 10 Dec 2011)
New Revision: 924

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
   trunk/build.lib.mk
   trunk/man/build.lib.mk.5
Log:
test for --tag=CC / --tag=CXX retardation; add LIBTOOLOPTS_{CC,CXX} options.

Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm	2011-11-19 04:31:49 UTC (rev 923)
+++ trunk/BSDBuild/cc.pm	2011-12-11 02:40:02 UTC (rev 924)
@@ -296,6 +296,23 @@
 	return (0);
 }
 EOF
+	
+	MkPrintN('checking for libtool --tag=CC retardation...');
+	my $code = << 'EOF';
+EOF
+	print 'cat << EOT > conftest.c', "\n",
+	      'int main(int argc, char *argv[]) { return (0); }', "\nEOT\n";
+	print << "EOF";
+\$LIBTOOL --quiet --mode=compile \$CC --tag=CC \$CFLAGS \$TEST_CFLAGS -o \$testdir/conftest.o
conftest.c 2>>config.log
+EOF
(Continue reading)


Gmane