20b65ea5c3
DragonFly to work around the _POSIX_SOURCE defines, which break cwchar's ::vfwprintf usage (aka ISO C99 extensions).
112 lines
4 KiB
Text
112 lines
4 KiB
Text
$NetBSD: patch-aa,v 1.3 2006/03/01 00:33:30 joerg Exp $
|
|
|
|
--- configure.pl.orig 2006-01-01 01:02:28.000000000 +0000
|
|
+++ configure.pl
|
|
@@ -74,7 +74,6 @@ my %DOCS = (
|
|
'deprecated.txt' => $DOC_DIR,
|
|
'license.txt' => $DOC_DIR,
|
|
'log.txt' => $DOC_DIR,
|
|
- 'rngs.txt' => $DOC_DIR,
|
|
'thanks.txt' => $DOC_DIR,
|
|
'todo.txt' => $DOC_DIR
|
|
);
|
|
@@ -278,6 +277,7 @@ my %OS_SUPPORTS_ARCH = (
|
|
'darwin' => [ 'ia32', 'ppc', 'ppc64', ],
|
|
'freebsd' => [ 'alpha', 'amd64', 'ia32', 'ia64', 'powerpc', 'sparc64',
|
|
],
|
|
+ 'dragonfly' => [ 'amd64', 'ia32', 'ia64' ],
|
|
'hpux' => [ 'hppa', 'ia64', ],
|
|
'irix' => [ 'mips32', 'mips64', ],
|
|
'linux' => [ 'alpha', 'amd64', 'arm', 'hppa', 'ia32', 'ia64', 'm68k',
|
|
@@ -298,6 +298,7 @@ my %OS_SUPPORTS_SHARED = (
|
|
'beos' => [ 'all', ],
|
|
'darwin' => [ 'all', ],
|
|
'freebsd' => [ 'all', ],
|
|
+ 'dragonfly' => [ 'all', ],
|
|
'hpux' => [ 'all', ],
|
|
'irix' => [ 'all', ],
|
|
'linux' => [ 'all', ],
|
|
@@ -314,6 +315,7 @@ my %OS_TYPE = (
|
|
'cygwin' => 'unix',
|
|
'darwin' => 'unix',
|
|
'freebsd' => 'unix',
|
|
+ 'dragonfly' => 'unix',
|
|
'hpux' => 'unix',
|
|
'irix' => 'unix',
|
|
'linux' => 'unix',
|
|
@@ -387,6 +389,9 @@ my %INSTALL_INFO = (
|
|
'freebsd' => {
|
|
'group' => 'wheel',
|
|
},
|
|
+ 'dragonfly' => {
|
|
+ 'group' => 'wheel',
|
|
+ },
|
|
'netbsd' => {
|
|
'group' => 'wheel',
|
|
},
|
|
@@ -406,7 +411,7 @@ my %CC_SUPPORTS_OS = (
|
|
'bcc' => [ 'windows', ],
|
|
'compaq' => [ 'linux', 'tru64', ],
|
|
'ekopath' => [ 'linux', ],
|
|
- 'gcc' => [ 'aix', 'beos', 'cygwin', 'darwin', 'freebsd', 'hpux', 'irix',
|
|
+ 'gcc' => [ 'aix', 'beos', 'cygwin', 'dragonfly', 'darwin', 'freebsd', 'hpux', 'irix',
|
|
'linux', 'netbsd', 'openbsd', 'qnx', 'solaris', 'tru64',
|
|
'windows', ],
|
|
'hpcc' => [ 'hpux', ],
|
|
@@ -663,6 +668,7 @@ my %CC_ABI_FLAGS = (
|
|
'gcc' => {
|
|
'amd64' => '-m64',
|
|
'freebsd' => '-pthread',
|
|
+ 'dragonfly' => '-pthread',
|
|
'mips32' => '-mabi=n32',
|
|
'mips64' => '-mabi=64',
|
|
'netbsd' => '-pthread',
|
|
@@ -772,6 +778,7 @@ my %REALNAME = (
|
|
'darwin' => 'Darwin / MacOS X',
|
|
'ekopath' => 'PathScale EKOPath C++',
|
|
'freebsd' => 'FreeBSD',
|
|
+ 'dragonfly' => 'DragonFly',
|
|
'gcc' => 'GNU C++',
|
|
'hpcc' => 'HP-UX C++',
|
|
'hppa' => 'HP-PA',
|
|
@@ -1696,12 +1703,6 @@ sub guess_triple
|
|
my @CCS = ('gcc', 'icc', 'compaq', 'kai'); # Skips several, oh well...
|
|
|
|
# First try the CC enviornmental variable, if it's set
|
|
- if(defined($ENV{CC}))
|
|
- {
|
|
- my @new_CCS = ($ENV{CC});
|
|
- foreach my $cc (@CCS) { push @new_CCS, $cc; }
|
|
- @CCS = @new_CCS;
|
|
- }
|
|
|
|
my $cc = '';
|
|
foreach (@CCS)
|
|
@@ -2040,8 +2041,12 @@ sub print_unix_makefile {
|
|
my $link_to = "-lm";
|
|
foreach my $lib (@{ $lib_list })
|
|
{
|
|
+ if ($lib =~ m/pthread/) {
|
|
+ $link_to .= " -" . $lib;
|
|
+ } else {
|
|
$link_to .= " -l" . $lib;
|
|
}
|
|
+ }
|
|
|
|
##################################################
|
|
# Generate a few variables #
|
|
@@ -2279,12 +2284,12 @@ $__TAB__\@for i in \$(HEADERS); do \\
|
|
$__TAB__ \$(INSTALL_CMD_DATA) \$\$i \$(HEADERDIR); \\
|
|
$__TAB__ done
|
|
$__TAB__\@\$(INSTALL_CMD_DATA) \$(STATIC_LIB) \$(LIBDIR)
|
|
-$__TAB__\@\$(INSTALL_CMD_EXEC) \$(CONFIG_SCRIPT) \$(BINDIR)
|
|
+$__TAB__\@\${BSD_INSTALL_SCRIPT} \$(CONFIG_SCRIPT) \$(BINDIR)
|
|
END_OF_INSTALL_SCRIPTS
|
|
|
|
if($make_shared) {
|
|
print $makefile <<END_OF_SYMLINKS;
|
|
-$__TAB__\@\$(INSTALL_CMD_EXEC) \$(SHARED_LIB) \$(LIBDIR)
|
|
+$__TAB__\@\${BSD_INSTALL_LIB} \$(SHARED_LIB) \$(LIBDIR)
|
|
$__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK0) \$(SYMLINK1)
|
|
$__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK1) \$(SYMLINK2)
|
|
$__TAB__\$(CD) \$(LIBDIR); \$(LN) \$(SYMLINK2) \$(SYMLINK3)
|