Picon

BSDBuild: r1030 - trunk/BSDBuild

Author: vedge
Date: 2014-07-22 06:41:40 -0400 (Tue, 22 Jul 2014)
New Revision: 1030

Modified:
   trunk/BSDBuild/kqueue.pm
Log:
cast to uintptr_t/intptr_t on NetBSD

Modified: trunk/BSDBuild/kqueue.pm
===================================================================
--- trunk/BSDBuild/kqueue.pm	2014-07-22 09:55:10 UTC (rev 1029)
+++ trunk/BSDBuild/kqueue.pm	2014-07-22 10:41:40 UTC (rev 1030)
 <at>  <at>  -39,8 +39,13  <at>  <at> 
 	int kq, fd = -1, nev;

 	if ((kq = kqueue()) == -1) { return (1); }
+#if defined(__NetBSD__)
+	EV_SET(&kev, (uintptr_t)fd, EVFILT_READ, EV_ADD|EV_ENABLE|EV_ONESHOT, 0, 0, (intptr_t)NULL);
+	EV_SET(&kev, (uintptr_t)1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 0, (intptr_t)NULL);
+#else
 	EV_SET(&kev, fd, EVFILT_READ, EV_ADD|EV_ENABLE|EV_ONESHOT, 0, 0, NULL);
-	EV_SET(&kev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 1000, 0);
+	EV_SET(&kev, 1, EVFILT_TIMER, EV_ADD|EV_ENABLE, 0, 0, NULL);
+#endif
 	nev = kevent(kq, &kev, 1, &chg, 1, NULL);
 	return (chg.flags & EV_ERROR);
 }
Picon

BSDBuild: r1029 - trunk/BSDBuild

Author: vedge
Date: 2014-07-22 05:55:10 -0400 (Tue, 22 Jul 2014)
New Revision: 1029

Modified:
   trunk/BSDBuild/strtold.pm
Log:
avoid a compiler warning on NetBSD

Modified: trunk/BSDBuild/strtold.pm
===================================================================
--- trunk/BSDBuild/strtold.pm	2014-07-16 02:17:37 UTC (rev 1028)
+++ trunk/BSDBuild/strtold.pm	2014-07-22 09:55:10 UTC (rev 1029)
 <at>  <at>  -24,7 +24,9  <at>  <at> 
 # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE..

 my $testCode = << 'EOF';
-#define _XOPEN_SOURCE 600
+#ifndef __NetBSD__
+# define _XOPEN_SOURCE 600
+#endif
 #include <stdlib.h>
 int
 main(int argc, char *argv[])
Picon

BSDBuild: r1028 - trunk

Author: vedge
Date: 2014-07-15 22:17:37 -0400 (Tue, 15 Jul 2014)
New Revision: 1028

Modified:
   trunk/mkconcurrent.pl
Log:
sync with libtool update

Modified: trunk/mkconcurrent.pl
===================================================================
--- trunk/mkconcurrent.pl	2014-07-13 09:38:17 UTC (rev 1027)
+++ trunk/mkconcurrent.pl	2014-07-16 02:17:37 UTC (rev 1028)
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 #!/usr/bin/perl
 #
-# Copyright (c) 2003-2012 Hypertriton, Inc. <http://hypertriton.com/>
+# Copyright (c) 2003-2014 Hypertriton, Inc. <http://hypertriton.com/>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 <at>  <at>  -31,12 +31,14  <at>  <at> 
  <at> DIRS = ();
 $BUILD = '';
  <at> MKFILES = (
-	'Makefile.proj',
-	'Makefile.prog',
+	'Makefile\.(prog|proj|in)',
 	'\.mk$',
 	'\.inc$',
(Continue reading)

Picon

BSDBuild: r1027 - trunk/BSDBuild

Author: vedge
Date: 2014-07-13 05:38:17 -0400 (Sun, 13 Jul 2014)
New Revision: 1027

Modified:
   trunk/BSDBuild/iconv.pm
Log:
remove the errno line, it causes warnings on some platforms.

Modified: trunk/BSDBuild/iconv.pm
===================================================================
--- trunk/BSDBuild/iconv.pm	2014-07-13 05:17:41 UTC (rev 1026)
+++ trunk/BSDBuild/iconv.pm	2014-07-13 09:38:17 UTC (rev 1027)
 <at>  <at>  -35,7 +35,6  <at>  <at> 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <iconv.h>

 int main(int argc, char *argv[])
 <at>  <at>  -48,10 +47,8  <at>  <at> 

 	cd = iconv_open("ISO-8859-1", "UTF-8");
 	rv = iconv(cd, &inbuf, &inlen, &outbuf, &outbuflen);
-	if (rv == (size_t)-1 && errno == E2BIG) {
-	}
 	iconv_close(cd);
-	return (0);
+	return ((rv == (size_t)-1));
(Continue reading)

Picon

BSDBuild: r1026 - trunk/BSDBuild

Author: vedge
Date: 2014-07-13 01:17:41 -0400 (Sun, 13 Jul 2014)
New Revision: 1026

Added:
   trunk/BSDBuild/csidl.pm
   trunk/BSDBuild/xbox.pm
Modified:
   trunk/BSDBuild/Makefile
Log:
+ xbox, csidl

Modified: trunk/BSDBuild/Makefile
===================================================================
--- trunk/BSDBuild/Makefile	2014-07-13 05:17:15 UTC (rev 1025)
+++ trunk/BSDBuild/Makefile	2014-07-13 05:17:41 UTC (rev 1026)
 <at>  <at>  -118,7 +118,9  <at>  <at> 
 	kqueue.pm \
 	timerfd.pm \
 	etubestore.pm \
-	uim.pm
+	uim.pm \
+	xbox.pm \
+	csidl.pm

 all:

Added: trunk/BSDBuild/csidl.pm
===================================================================
--- trunk/BSDBuild/csidl.pm	                        (rev 0)
(Continue reading)

Picon

BSDBuild: r1024 - trunk/BSDBuild

Author: vedge
Date: 2014-07-04 09:40:00 -0400 (Fri, 04 Jul 2014)
New Revision: 1024

Modified:
   trunk/BSDBuild/getopt.pm
Log:
use the more portable <getopt.h>, so we're not pulling up <unistd.h>
on cygwin or mingw32.

Modified: trunk/BSDBuild/getopt.pm
===================================================================
--- trunk/BSDBuild/getopt.pm	2014-07-02 14:23:50 UTC (rev 1023)
+++ trunk/BSDBuild/getopt.pm	2014-07-04 13:40:00 UTC (rev 1024)
 <at>  <at>  -28,7 +28,7  <at>  <at> 
 {
 	TryCompile 'HAVE_GETOPT', << 'EOF';
 #include <string.h>
-#include <unistd.h>
+#include <getopt.h>

 int
 main(int argc, char *argv[])
Picon

BSDBuild: r1023 - in trunk: . BSDBuild

Author: vedge
Date: 2014-07-02 10:23:50 -0400 (Wed, 02 Jul 2014)
New Revision: 1023

Modified:
   trunk/BSDBuild/Core.pm
   trunk/BSDBuild/Mail-SpamAssassin.pm
   trunk/BSDBuild/agar-au.pm
   trunk/BSDBuild/agar-core.pm
   trunk/BSDBuild/agar-dev.pm
   trunk/BSDBuild/agar-math.pm
   trunk/BSDBuild/agar-vg.pm
   trunk/BSDBuild/agar.pm
   trunk/BSDBuild/alsa.pm
   trunk/BSDBuild/altivec.pm
   trunk/BSDBuild/cg.pm
   trunk/BSDBuild/cocoa.pm
   trunk/BSDBuild/curl.pm
   trunk/BSDBuild/db4.pm
   trunk/BSDBuild/edacious.pm
   trunk/BSDBuild/etubestore.pm
   trunk/BSDBuild/fastcgi.pm
   trunk/BSDBuild/fontconfig.pm
   trunk/BSDBuild/freesg-rg.pm
   trunk/BSDBuild/freesg.pm
   trunk/BSDBuild/freetype.pm
   trunk/BSDBuild/glib.pm
   trunk/BSDBuild/glib2.pm
   trunk/BSDBuild/glu.pm
   trunk/BSDBuild/jpeg.pm
(Continue reading)

Picon

BSDBuild: r1022 - trunk

Author: vedge
Date: 2014-07-02 09:20:51 -0400 (Wed, 02 Jul 2014)
New Revision: 1022

Modified:
   trunk/mkconfigure.pl
Log:
use $ECHO_N, not echo -n

Modified: trunk/mkconfigure.pl
===================================================================
--- trunk/mkconfigure.pl	2014-07-02 10:52:57 UTC (rev 1021)
+++ trunk/mkconfigure.pl	2014-07-02 13:20:51 UTC (rev 1022)
 <at>  <at>  -1341,12 +1341,12  <at>  <at> 
 echo "SRCDIR=${SRC}" >> Makefile.config
 echo "BLDDIR=${BLD}" >> Makefile.config

-echo -n "./configure" >> config.log
-echo -n "./configure" >> config.status
+$ECHO_N "./configure" >> config.log
+$ECHO_N "./configure" >> config.status
 for arg
 do
-	echo -n " $arg" >> config.log
-	echo -n " $arg" >> config.status
+	$ECHO_N " $arg" >> config.log
+	$ECHO_N " $arg" >> config.status
 done
 echo "" >> config.log
 echo "" >> config.status
(Continue reading)

Picon

BSDBuild: r1021 - trunk/BSDBuild

Author: vedge
Date: 2014-07-02 06:52:57 -0400 (Wed, 02 Jul 2014)
New Revision: 1021

Modified:
   trunk/BSDBuild/sdl.pm
Log:
on cygwin and mingw targets, look for -lSDL.dll and use that instead of
the `sdl-config --libs` output. this prevents problems with -lSDLmain
and -lmingw32 with SDL used as an inter-library dependency

Modified: trunk/BSDBuild/sdl.pm
===================================================================
--- trunk/BSDBuild/sdl.pm	2014-07-02 06:52:39 UTC (rev 1020)
+++ trunk/BSDBuild/sdl.pm	2014-07-02 10:52:57 UTC (rev 1021)
 <at>  <at>  -52,6 +52,7  <at>  <at> 
 	my ($ver, $pfx) =  <at> _;

 	MkIfNE($pfx, '');
+		MkExecOutputPfx($pfx, 'sdl-config', '--prefix', 'SDL_PREFIX');
 		MkExecOutputPfx($pfx, 'sdl-config', '--version', 'SDL_VERSION');
 		MkExecOutputPfx($pfx, 'sdl-config', '--cflags', 'SDL_CFLAGS');
 		MkExecOutputPfx($pfx, 'sdl-config', '--libs', 'SDL_LIBS');
 <at>  <at>  -60,6 +61,7  <at>  <at> 
 		MkCaseBegin('*-*-darwin*');
 			MkExecOutput('sdl-config', '--version', 'SDL_VERSION');
 			MkIfNE('${SDL_VERSION}', '');
+				MkExecOutput('sdl-config', '--prefix', 'SDL_PREFIX');
 				MkExecOutput('sdl-config', '--cflags', 'SDL_CFLAGS');
 				MkExecOutput('sdl-config', '--libs', 'SDL_LIBS');
(Continue reading)

Picon

BSDBuild: r1020 - trunk/BSDBuild

Author: vedge
Date: 2014-07-02 02:52:39 -0400 (Wed, 02 Jul 2014)
New Revision: 1020

Modified:
   trunk/BSDBuild/jpeg.pm
Log:
remove _WIN32 test

Modified: trunk/BSDBuild/jpeg.pm
===================================================================
--- trunk/BSDBuild/jpeg.pm	2014-07-01 07:55:22 UTC (rev 1019)
+++ trunk/BSDBuild/jpeg.pm	2014-07-02 06:52:39 UTC (rev 1020)
 <at>  <at>  -55,10 +55,6  <at>  <at> 
 		MkPrint('yes');
 		MkPrintN('checking whether libjpeg works...');
 		MkCompileC('HAVE_JPEG', '${JPEG_CFLAGS}', '${JPEG_LIBS}', << 'EOF');
-#ifdef _WIN32
-#error "libjpeg conflicts with windows.h"
-#endif
-
 #include <stdio.h>
 #include <jpeglib.h>
Picon

BSDBuild: r1019 - in trunk: . BSDBuild man

Author: vedge
Date: 2014-07-01 03:55:22 -0400 (Tue, 01 Jul 2014)
New Revision: 1019

Modified:
   trunk/BSDBuild/cc.pm
   trunk/BSDBuild/cxx.pm
   trunk/BSDBuild/objc.pm
   trunk/build.lib.mk
   trunk/build.prog.mk
   trunk/man/build.prog.mk.5
Log:
- add test for -mwindows and -mconsole flags on windows, used by
  build.prog.mk(5) depending on specified PROG_TYPE.
- add tests for linker flags -no-undefined and -static-libgcc on windows;
  export LIBTOOLOPTS_SHARED accordingly.
- remove duplicate tests in cxx and objc modules -- depend on cc instead.

Modified: trunk/BSDBuild/cc.pm
===================================================================
--- trunk/BSDBuild/cc.pm	2014-06-29 10:47:45 UTC (rev 1018)
+++ trunk/BSDBuild/cc.pm	2014-07-01 07:55:22 UTC (rev 1019)
 <at>  <at>  -25,9 +25,6  <at>  <at> 

 sub Test
 {
-	# Look for a C compiler.
-	# XXX duplicated code between cc/cxx
-	#
 	print << 'EOF';
(Continue reading)


Gmane