OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   09-Dec-2004 16:18:57
  Branch: HEAD                             Handle: 2004120915185700

  Modified files:
    openpkg-src/ethereal    ethereal.spec

  Log:
    correct static linking logic in build configuration on SVR5 (ELF
    binary standard) platforms

  Summary:
    Revision    Changes     Path
    1.47        +7  -2      openpkg-src/ethereal/ethereal.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ethereal/ethereal.spec
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 ethereal.spec
  --- openpkg-src/ethereal/ethereal.spec        23 Oct 2004 10:00:42 -0000      
1.46
  +++ openpkg-src/ethereal/ethereal.spec        9 Dec 2004 15:18:57 -0000       
1.47
  @@ -34,7 +34,7 @@
   Group:        Network
   License:      GPL
   Version:      0.10.7
  -Release:      20041023
  +Release:      20041209
   
   #   package options
   %option       with_zlib    yes
  @@ -93,6 +93,11 @@
   %prep
       %setup -q
       %patch -p0
  +    %{l_shtool} subst \
  +        -e 's;-Wl,-static *;;g' \
  +        -e 's;-all-static *;;g' \
  +        -e 's;-static *;;g' \
  +        Makefile.in
   
   %build
       CC="%{l_cc}" \
  @@ -135,7 +140,7 @@
   %endif
           --without-krb5 \
           --disable-shared \
  -        --disable-static \
  +        --enable-static \
           --disable-ipv6
       %{l_make} %{l_mflags}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to