diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-12-11 16:00:00 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-12-11 16:00:00 +0000 |
| commit | 966773c540e263a1c99778b8ba5857ab64f5a96e (patch) | |
| tree | 74bd9a7695f13d199b90c69cb8f2444167816401 | |
| parent | f787e1e3ff11339269bdc11e253af91e5961e013 (diff) | |
| download | cups-966773c540e263a1c99778b8ba5857ab64f5a96e.tar.gz | |
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
| -rw-r--r-- | cups/Makefile | 9 | ||||
| -rw-r--r-- | ppdc/Makefile | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/cups/Makefile b/cups/Makefile index 83d7c35e2..485b5671c 100644 --- 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 ab54fba55..68bf6b2a4 100644 --- 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)/$@ \ |