OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 11-Jun-2003 12:18:20
Branch: HEAD Handle: 2003061111181901
Modified files:
openpkg-src/apache apache.patch apache.spec
openpkg-web news.txt
Log:
be smarter with linker options, but not smart enough
Summary:
Revision Changes Path
1.4 +12 -13 openpkg-src/apache/apache.patch
1.138 +1 -1 openpkg-src/apache/apache.spec
1.4819 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 apache.patch
--- openpkg-src/apache/apache.patch 4 Jun 2003 16:36:35 -0000 1.3
+++ openpkg-src/apache/apache.patch 11 Jun 2003 10:18:20 -0000 1.4
@@ -15,23 +15,22 @@
##
## check and debug
---- apache_1.3.27/src/Configure.dist 2003-06-04 18:22:40 +0200
-+++ apache_1.3.27/src/Configure 2003-06-04 18:24:18 +0200
-@@ -1190,14 +1190,10 @@
- SHLIB_SUFFIX_DEPTH=0
- ;;
+--- apache_1.3.27/src/Configure.dist 2003-06-11 11:59:51.000000000 +0200
++++ apache_1.3.27/src/Configure 2003-06-11 12:00:44.000000000 +0200
+@@ -1192,12 +1192,14 @@
*-solaris2*)
-- if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then
-- CFLAGS_SHLIB="-fPIC"
-- else
-- CFLAGS_SHLIB="-KPIC"
-- fi
+ if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then
+ CFLAGS_SHLIB="-fPIC"
++ LDFLAGS_SHLIB="-shared"
++ LDFLAGS_SHLIB_EXPORT="-Wl,-E"
+ else
+ CFLAGS_SHLIB="-KPIC"
++ LDFLAGS_SHLIB="-G"
++ LDFLAGS_SHLIB_EXPORT=""
+ fi
- LDFLAGS_SHLIB="-G"
-+ CFLAGS_SHLIB="-fPIC"
-+ LDFLAGS_SHLIB="-shared"
LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
- LDFLAGS_SHLIB_EXPORT=""
-+ LDFLAGS_SHLIB_EXPORT="-Wl,-E"
SHLIB_SUFFIX_DEPTH=1
;;
*-sunos4*)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.137 -r1.138 apache.spec
--- openpkg-src/apache/apache.spec 5 Jun 2003 09:42:26 -0000 1.137
+++ openpkg-src/apache/apache.spec 11 Jun 2003 10:18:20 -0000 1.138
@@ -60,7 +60,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20030605
+Release: 20030611
# package options (suexec related)
%option with_suexec yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.4818 -r1.4819 news.txt
--- openpkg-web/news.txt 11 Jun 2003 10:00:13 -0000 1.4818
+++ openpkg-web/news.txt 11 Jun 2003 10:18:19 -0000 1.4819
@@ -1,3 +1,4 @@
+11-Jun-2003: Upgraded package: P<apache-1.3.27-20030611>
11-Jun-2003: Upgraded package: P<sqlite-2.8.3-20030611>
11-Jun-2003: Upgraded package: P<cocor-1.07-20030611>
11-Jun-2003: Upgraded package: P<pdflib-5.0.1-20030611>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
