diff options
| author |   Timothy Redaelli <drizzt@gentoo.org> | 2009-02-10 11:05:22 +0000 |
|---|---|---|
| committer | Timothy Redaelli <drizzt@gentoo.org> | 2009-02-10 11:05:22 +0000 |
| commit | 40c26e0565fcc1b767f71c309646829ac3f1bcfa (patch) | |
| tree | a641c93cda2d3e7c0f8cc43b1db20cf9cd2440d9 /media-libs/openjpeg/files | |
| parent | new version with some improvements (diff) | |
| download | historical-40c26e0565fcc1b767f71c309646829ac3f1bcfa.tar.gz historical-40c26e0565fcc1b767f71c309646829ac3f1bcfa.tar.bz2 historical-40c26e0565fcc1b767f71c309646829ac3f1bcfa.zip | |
Fix library naming wrt bug #258373
Thanks to Peter Alfredsen for reporting and thanks to Diego Pettenò for bug #258360
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'media-libs/openjpeg/files')
| -rw-r--r-- | media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch b/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch new file mode 100644 index 000000000000..5dfd6a91e72f --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-1.3-Makefile.patch @@ -0,0 +1,42 @@ +diff -NrU5 OpenJPEG_v1_3.orig/Makefile OpenJPEG_v1_3/Makefile +--- OpenJPEG_v1_3.orig/Makefile 2009-02-09 21:25:42.000000000 +0100 ++++ OpenJPEG_v1_3/Makefile 2009-02-09 21:34:35.000000000 +0100 +@@ -24,11 +24,11 @@ + MODULES = $(SRCS:.c=.o) + CFLAGS = $(COMPILERFLAGS) $(INCLUDE) + + TARGET = openjpeg + STATICLIB = lib$(TARGET).a +-SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so ++SHAREDLIB = lib$(TARGET).so.$(VER_MAJOR).$(VER_MINOR) + LIBNAME = lib$(TARGET).so.$(VER_MAJOR) + + + + default: all +@@ -52,20 +52,20 @@ + + $(STATICLIB): $(MODULES) + $(AR) r $@ $(MODULES) + + $(SHAREDLIB): $(MODULES) +- $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES) + + install: OpenJPEG + install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)' +- install -m 644 -o root -g root $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' ++ install -m 644 $(STATICLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' + ranlib '$(DESTDIR)$(INSTALL_LIBDIR)/$(STATICLIB)' +- install -m 755 -o root -g root $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' ++ install -m 755 $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)' + ln -sf $(SHAREDLIB) '$(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)' +- install -m 644 -o root -g root libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' +- -ldconfig ++ ln -sf $(LIBNAME) '$(DESTDIR)$(INSTALL_LIBDIR)/lib$(TARGET).so' ++ install -m 644 libopenjpeg/openjpeg.h '$(DESTDIR)$(INSTALL_INCLUDE)' + + clean: + rm -rf core dist/ u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME) + + osx: |