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                      Date:   11-Jun-2003 12:55:07
  Branch: HEAD                             Handle: 2003061111550700

  Modified files:
    openpkg-src/apache      apache.patch

  Log:
    more smartness in linking

  Summary:
    Revision    Changes     Path
    1.5         +24 -14     openpkg-src/apache/apache.patch
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.patch
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 apache.patch
  --- openpkg-src/apache/apache.patch   11 Jun 2003 10:18:20 -0000      1.4
  +++ openpkg-src/apache/apache.patch   11 Jun 2003 10:55:07 -0000      1.5
  @@ -16,21 +16,31 @@
    ##
    ##  check and debug
   --- 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 @@
  ++++ apache_1.3.27/src/Configure      2003-06-11 12:46:14.000000000 +0200
  +@@ -1190,14 +1190,20 @@
  +         SHLIB_SUFFIX_DEPTH=0
  +         ;;
        *-solaris2*)
  -         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"
  -         LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
  --        LDFLAGS_SHLIB_EXPORT=""
  +-        if [ "x`$CC -v 2>&1 | grep gcc`" != "x" ]; then
  +-            CFLAGS_SHLIB="-fPIC"
  +-        else
  +-            CFLAGS_SHLIB="-KPIC"
  +-        fi
  ++        CFLAGS_SHLIB="-KPIC"
  +         LDFLAGS_SHLIB="-G"
  +-        LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
  +         LDFLAGS_SHLIB_EXPORT=""
  ++        for word in `$CC -v 2>&1` ; do
  ++            case $word in 
  ++            --with-gnu-ld)
  ++                LDFLAGS_SHLIB="-shared"
  ++                ;;
  ++            *gcc*)
  ++                CFLAGS_SHLIB="-fPIC"
  ++                ;;
  ++            esac
  ++        done
  ++        LDFLAGS_MOD_SHLIB=$LDFLAGS_SHLIB
            SHLIB_SUFFIX_DEPTH=1
            ;;
        *-sunos4*)
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to