Fix export list for shared libraries (<rdar://problem/23303388>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13008 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/cups/Makefile b/cups/Makefile
index 83d7c35e2b444aee1eac01cdc3eed8300f851992..485b5671cf3e45376a228ef388e2973c224ecb2e 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -322,13 +322,14 @@ libcups.so.2:     $(LIBOBJS)
 
 libcups.2.dylib:       $(LIBOBJS) $(LIBCUPSORDER)
        echo Creating export list for $@...
-       nm $(LIBOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}' | \
-               grep -v -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault|_httpWait)$$' | \
+       nm -gm $(LIBOBJS) 2>/dev/null | grep "__text" | grep -v weak | \
+               awk '{print $$NF}' | \
+               grep -v -E -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault|_httpWait)$$' | \
                sort >t.exp
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
-               -current_version 2.11.0 \
+               -current_version 2.12.0 \
                -compatibility_version 2.0.0 \
                -exported_symbols_list t.exp \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -344,7 +345,7 @@ libcups.2.dylib:    $(LIBOBJS) $(LIBCUPSORDER)
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-               -rpath $(LIBDIR) -version-info 2:11 $(LIBGSSAPI) $(SSLLIBS) \
+               -rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 

diff --git a/ppdc/Makefile b/ppdc/Makefile
index ab54fba55d7f362cf7d72f209e8d592020c84350..68bf6b2a41581aa588cd4d0329fefe97d87c3139 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -347,7 +347,7 @@ libcupsppdc.so.1:   $(LIBOBJS) ../cups/$(LIBCUPS)
 
 libcupsppdc.1.dylib:   $(LIBOBJS) ../cups/$(LIBCUPS)
        echo Creating export list for $@...
-       nm $(LIBOBJS) | grep "T __" | grep -v weak | awk '{print $$3}' | sort >t.exp
+       nm -gm $(LIBOBJS) | grep "__text" | grep -v weak | awk '{print $$NF}' | sort >t.exp
        echo Linking $@...
        $(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \