From ba62ce46c8dbe300a5f8044cb7ffc59a19885502 Mon Sep 17 00:00:00 2001 From: Robert Nagy Date: Wed, 15 Jun 2011 12:55:51 +0200 Subject: only fetch external tarballs if --disable-fetch-external is not defined --- set_soenv.in | 1 - 1 file changed, 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 414dae21a1cb..779fb3e956e0 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1694,7 +1694,6 @@ ToFile( "PSPRINT", "TRUE", "e" ); ToFile( "MKDEPENDSOLVER", "TRUE", "e" ); ToFile( "nodep", "@nodep@", "e" ); ToFile( "TARFILE_LOCATION", $TARFILE_LOCATION, "e" ); -ToFile( "DO_FETCH_TARBALLS", "@DO_FETCH_TARBALLS@", "e" ); ToFile( "GIT_LINK_SRC", "@GIT_LINK_SRC@", "e" ); ToFile( "GIT_REPO_NAMES", "@GIT_REPO_NAMES@", "e" ); -- cgit From d75defa37fb46aedd81e6d6c360375e37e8473e7 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Thu, 16 Jun 2011 19:12:35 +0200 Subject: Make the online update service configurable (via --enable-online-update). Signed-off-by: Petr Mladek --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 779fb3e956e0..f015babca21a 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1983,6 +1983,7 @@ ToFile( "DB_CPPLIB", "@DB_CPPLIB@", "e" ); ToFile( "DB_INCLUDES", "@DB_INCLUDES@", "e" ); ToFile( "ENABLE_MYSQLC", "@ENABLE_MYSQLC@", "e" ); ToFile( "ENABLE_LOMENUBAR", "@ENABLE_LOMENUBAR@", "e" ); +ToFile( "ENABLE_ONLINE_UPDATE","@ENABLE_ONLINE_UPDATE@", "e" ); ToFile( "SYSTEM_MYSQL", "@SYSTEM_MYSQL@", "e" ); ToFile( "SYSTEM_MYSQL_CPPCONN","@SYSTEM_MYSQL_CPPCONN@","e" ); ToFile( "MYSQL_INC", "@MYSQL_INC@", "e" ); -- cgit From e17aac891e999265cbd34d81d963a57fe12c794a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 18 Jun 2011 16:35:59 +0300 Subject: Temporary hack can be binned now --- set_soenv.in | 2 -- 1 file changed, 2 deletions(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 863a39100062..35f6feaa571e 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -670,8 +670,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) else # The MSVC section starts here { print "Setting Windows (MSVC) specific values... "; $outfile = "WindowsMSVCEnv.Set.sh"; - # Temporary hack: remove the old winenv.set.sh to avoid confusion... drop after a few weeks - unlink('winenv.set.sh'); $COMPATH = PathFormat('@COMPATH@'); $COM = "MSC"; $OUTPATH = "wntmsci@COMEX@"; -- cgit From 510737a54ad921ec6d873d1fcda20fae28d99a16 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 12 Jun 2011 17:37:11 +0200 Subject: enable libstdc++'s debug mode with --enable-debug --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 35f6feaa571e..881d14f42b85 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1516,6 +1516,7 @@ ToFile( "NO_BSYMBOLIC", $NO_BSYMBOLIC, "e" ); if ("@ENABLE_DEBUG@" eq "TRUE") { ToFile( "debug", "true", "e" ); } +ToFile( "ENABLE_DEBUG_STL", "@ENABLE_DEBUG_STL@", "e" ); if ("@ENABLE_WERROR@" eq "FALSE") { ToFile( "EXTERNAL_WARNINGS_NOT_ERRORS", "TRUE", "e" ); } -- cgit From 67e1946064ebc1b31111f09024622df735526997 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 20 Jun 2011 23:30:30 +0300 Subject: Disable ATL when compiling with MinGW --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 881d14f42b85..2c7dc3c19b40 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1680,6 +1680,7 @@ if ( $platform =~ m/cygwin/ ) } elsif ( $platform =~ m/mingw32/ ) { ToFile( "NSIS_PATH", $NSIS_PATH, "e" ); + ToFile( "DISABLE_ATL", "@DISABLE_ATL@", "e" ); } if ("@WITH_VC_REDIST@" eq "TRUE") { -- cgit From 9574f268a838690811bce7eb3fdb2020bb8fe6cc Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 22 Jun 2011 12:43:33 +0100 Subject: add FONTCONFIG_[LIBS|CFLAGS] --- set_soenv.in | 2 ++ 1 file changed, 2 insertions(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 2c7dc3c19b40..4be6b15b48aa 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1827,6 +1827,8 @@ ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" ); ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" ); ToFile( "ENABLE_RANDR", "@ENABLE_RANDR@", "e" ); ToFile( "ENABLE_FONTCONFIG", "@ENABLE_FONTCONFIG@", "e" ); +ToFile( "FONTCONFIG_LIBS", "@FONTCONFIG_LIBS@", "e"); +ToFile( "FONTCONFIG_CFLAGS", "@FONTCONFIG_CFLAGS@", "e"); ToFile( "ENABLE_DIRECTX", "@ENABLE_DIRECTX@", "e" ); ToFile( "ENABLE_LAYOUT", "@ENABLE_LAYOUT@", "e" ); ToFile( "ENABLE_PCH", "@ENABLE_PCH@", "e" ); -- cgit From bb4e01086cc83eda12af610a1d29f4d390b7d20b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 23 Jun 2011 01:46:11 +0300 Subject: Don't use FLIPCMD when cross-compiling from Unix --- set_soenv.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 4be6b15b48aa..4378bb88e417 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -655,7 +655,9 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) { print "Setting Windows (MinGW) specific values... "; # At the moment this implies the use of tcsh # WTF does that mean? - $FLIPCMD = "slfl.pl"; + + $FLIPCMD = "slfl.pl" if '@build_os@' eq 'cygwin'; + $PATH_SEPERATOR = ';'; $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin'; $outfile = "WindowsMinGWEnv.Set.sh"; -- cgit From 4e674ab45bde89fd10f94c8357c4c5697540d04f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 29 Jun 2011 16:22:25 +0100 Subject: make cairo an unconditional requirement for text rendering --- set_soenv.in | 1 - 1 file changed, 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 4378bb88e417..6f3076b67303 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1930,7 +1930,6 @@ ToFile( "POPPLER_LIBS", "@POPPLER_LIBS@", "e" ); ToFile( "GSTREAMER_CFLAGS", "@GSTREAMER_CFLAGS@", "e" ); ToFile( "GSTREAMER_LIBS", "@GSTREAMER_LIBS@", "e" ); ToFile( "SYSTEM_CAIRO", "@SYSTEM_CAIRO@", "e" ); -ToFile( "BUILD_PIXMAN", "@BUILD_PIXMAN@", "e" ); ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" ); ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" ); ToFile( "XRANDR_CFLAGS", "@XRANDR_CFLAGS@", "e" ); -- cgit From e214780d71185e482cf8d1a33d8abdff9067e86a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 29 Jun 2011 16:26:07 +0100 Subject: fix stray define --- set_soenv.in | 1 - 1 file changed, 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 6f3076b67303..62283e1db665 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1548,7 +1548,6 @@ ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" ); ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" ); ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" ); ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" ); -ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" ); ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" ); ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" ); ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" ); -- cgit From 7c46fa44948339eee2ac8e47b12a70bd5a7211d7 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 3 Jul 2011 16:37:39 +0300 Subject: Most likely pointless to pass -I $COMPATH/include when using gcc Surely gcc finds its default header location anyway. --- set_soenv.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 62283e1db665..022a86ea81ca 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1321,7 +1321,7 @@ if ($platform =~ m/solaris/ && ! $CC =~ "gcc") $SOLARINC .= '/SC5 '; } # Platform dependent include path at the top of this list of include paths -if ($platform =~ m/solaris/) +if ($platform =~ m/solaris/ && ! $CC =~ "gcc") { $SOLARINC .= $I.$COMPATH.$INCLUDE; } -- cgit From 3f086957df272b1951e7b631222fa88c59aa5d0b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 9 Jul 2011 13:37:20 +0300 Subject: Don't use -L /usr/lib when building for iOS --- set_soenv.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 022a86ea81ca..b632ee91955b 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1291,13 +1291,14 @@ elsif ($platform =~ m/cygwin|mingw32/) $L.'$SOLARVER'.$ds.'$INPATH'.$LIB; } elsif ($platform =~ m/darwin/) -{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB. - $L.$USR_LIB; +{ $SOLARLIB = $L.'$SOLARVER'.$ds.'$INPATH'.$LIB; + if ($platform !~ m/^arm-apple/) + { $SOLARLIB .= $L.$USR_LIB; + } # [ed] 6/15/02 Add in X11 libraries onto the library path if ($GUIBASE eq "unx") { $SOLARLIB .= $L.$XLIB; } - } if ($SYSTEM_MOZILLA eq "YES") -- cgit From fe6dcc2e1b3e081161a44313e86cef82ccf30a8e Mon Sep 17 00:00:00 2001 From: Mike Eberdt Date: Tue, 12 Jul 2011 09:07:42 +0100 Subject: accept x86_64 for FreeBSD as well --- set_soenv.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index b632ee91955b..9a185df6af47 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -323,7 +323,7 @@ elsif ( $platform =~ m/freebsd/ ) $OS = "FREEBSD"; $PATH_SEPERATOR = $ps; $OSVERSION = '@OSVERSION@'; - if ($platform =~ m/^amd64/) + if ($platform =~ m/^(amd64|x86_64)/) { my ( $JAVA_OS ); print "Setting FreeBSD AMD64 specific values... "; $outfile = "FreeBSDAMDEnv.Set.sh"; -- cgit From 649a3a418160979179ccdfd997edb8dbf83a6d25 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 21 Jul 2011 17:43:23 +0300 Subject: Propagate DISABLE_ACTIVEX also in the WNTGCC case --- set_soenv.in | 1 + 1 file changed, 1 insertion(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 9a185df6af47..9ff4b034f1e7 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1682,6 +1682,7 @@ if ( $platform =~ m/cygwin/ ) } elsif ( $platform =~ m/mingw32/ ) { ToFile( "NSIS_PATH", $NSIS_PATH, "e" ); + ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" ); ToFile( "DISABLE_ATL", "@DISABLE_ATL@", "e" ); } -- cgit