Changeset 11959


Ignore:
Timestamp:
2008-07-27T15:17:05+02:00 (10 years ago)
Author:
florian
Message:

Do not run ldconfig while cross-compiling zlib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/zlib/patches/100-cross_compile.patch

    r7490 r11959  
    11Index: zlib-1.2.3/Makefile.in 
    22=================================================================== 
    3 --- zlib-1.2.3.orig/Makefile.in 2007-06-04 13:24:03.760040896 +0200 
    4 +++ zlib-1.2.3/Makefile.in      2007-06-04 13:24:03.839028888 +0200 
     3--- zlib-1.2.3.orig/Makefile.in 2005-07-18 04:25:21.000000000 +0200 
     4+++ zlib-1.2.3/Makefile.in      2008-07-27 14:57:32.000000000 +0200 
    55@@ -25,20 +25,23 @@ 
    66 #           -Wstrict-prototypes -Wmissing-prototypes 
     
    5353        ln -s $@ $(SHAREDLIB) 
    5454        ln -s $@ $(SHAREDLIBM) 
    55 @@ -90,23 +95,23 @@ 
     55@@ -90,23 +95,22 @@ 
    5656        $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) 
    5757  
     
    8080          ln -s $(SHAREDLIBV) $(SHAREDLIB); \ 
    8181          ln -s $(SHAREDLIBV) $(SHAREDLIBM); \ 
    82           (ldconfig || true)  >/dev/null 2>&1; \ 
     82-         (ldconfig || true)  >/dev/null 2>&1; \ 
    8383        fi 
    8484-       cp zlib.3 $(man3dir) 
     
    8888 # The ranlib in install is needed on NeXTSTEP which checks file times 
    8989 # ldconfig is for Linux 
    90   
     90 
    9191Index: zlib-1.2.3/configure 
    92 =================================================================== 
    93 --- zlib-1.2.3.orig/configure   2007-06-04 13:24:03.765040136 +0200 
    94 +++ zlib-1.2.3/configure        2007-06-04 13:24:03.839028888 +0200 
     92===================================================================  
     93--- zlib-1.2.3.orig/configure   2005-07-11 22:11:57.000000000 +0200 
     94+++ zlib-1.2.3/configure        2008-07-27 14:57:24.000000000 +0200 
    9595@@ -23,7 +23,7 @@ 
    9696 VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` 
     
    207207Index: zlib-1.2.3/contrib/minizip/Makefile 
    208208=================================================================== 
    209 --- zlib-1.2.3.orig/contrib/minizip/Makefile    2007-06-04 13:24:03.773038920 +0200 
    210 +++ zlib-1.2.3/contrib/minizip/Makefile 2007-06-04 13:24:03.839028888 +0200 
     209--- zlib-1.2.3.orig/contrib/minizip/Makefile    2005-07-12 20:08:40.000000000 +0200 
     210+++ zlib-1.2.3/contrib/minizip/Makefile 2008-07-27 14:57:24.000000000 +0200 
    211211@@ -1,8 +1,8 @@ 
    212212 CC=cc 
Note: See TracChangeset for help on using the changeset viewer.