diff options
| author |   Amy Liffey <amynka@gentoo.org> | 2014-08-20 10:58:35 +0000 |
|---|---|---|
| committer | Amy Liffey <amynka@gentoo.org> | 2014-08-20 10:58:35 +0000 |
| commit | 24477dc06ae8060d05cdf2eafe8dc3a1b5d5a40e (patch) | |
| tree | 7d2455119e63e90fddffcbea36e19044d3db9532 /media-libs/openctm | |
| parent | bump (diff) | |
| download | gentoo-2-24477dc06ae8060d05cdf2eafe8dc3a1b5d5a40e.tar.gz gentoo-2-24477dc06ae8060d05cdf2eafe8dc3a1b5d5a40e.tar.bz2 gentoo-2-24477dc06ae8060d05cdf2eafe8dc3a1b5d5a40e.zip | |
Sed madness removed and integrated to no-strip.patch
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 34E69781)
Diffstat (limited to 'media-libs/openctm')
| -rw-r--r-- | media-libs/openctm/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/openctm/files/openctm-no-strip.patch | 34 | ||||
| -rw-r--r-- | media-libs/openctm/openctm-1.0.3.ebuild | 10 |
3 files changed, 42 insertions, 8 deletions
diff --git a/media-libs/openctm/ChangeLog b/media-libs/openctm/ChangeLog index 1cfa99946d3c..776d9b6728d6 100644 --- a/media-libs/openctm/ChangeLog +++ b/media-libs/openctm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/openctm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/ChangeLog,v 1.5 2014/08/18 23:11:10 amynka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/ChangeLog,v 1.6 2014/08/20 10:58:35 amynka Exp $ + + 20 Aug 2014; Amy Winston <amynka@gentoo.org> +files/openctm-no-strip.patch, + openctm-1.0.3.ebuild: + Sed madness removed and integrated to no-strip.patch 18 Aug 2014; Amy Winston <amynka@gentoo.org> openctm-1.0.3.ebuild: bad sed repaired diff --git a/media-libs/openctm/files/openctm-no-strip.patch b/media-libs/openctm/files/openctm-no-strip.patch new file mode 100644 index 000000000000..5e31d4017b68 --- /dev/null +++ b/media-libs/openctm/files/openctm-no-strip.patch @@ -0,0 +1,34 @@ +diff -urN OpenCTM-1.0.3.old/lib/Makefile.linux OpenCTM-1.0.3/lib/Makefile.linux +--- OpenCTM-1.0.3.old/lib/Makefile.linux 2014-08-20 09:39:00.614744990 +0200 ++++ OpenCTM-1.0.3/lib/Makefile.linux 2014-08-20 09:40:09.782667989 +0200 +@@ -72,7 +72,7 @@ + $(RM) $(DYNAMICLIB) $(SONAME) $(LIBNAME) $(OBJS) $(LZMA_OBJS)
+
+ $(DYNAMICLIB): $(OBJS) $(LZMA_OBJS)
+- $(CC) $(LDFLAGS) -shared -s -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $(OBJS) $(LZMA_OBJS) -lm
+ ln -s $(DYNAMICLIB) $(SONAME)
+ ln -s $(DYNAMICLIB) $(LIBNAME)
+
+diff -urN OpenCTM-1.0.3.old/tools/Makefile.linux OpenCTM-1.0.3/tools/Makefile.linux +--- OpenCTM-1.0.3.old/tools/Makefile.linux 2014-08-20 09:39:00.583745025 +0200 ++++ OpenCTM-1.0.3/tools/Makefile.linux 2014-08-20 09:40:09.751668023 +0200 +@@ -52,15 +52,15 @@ + rm -f ctmconv ctmviewer ctmbench $(CTMCONVOBJS) $(CTMVIEWEROBJS) $(CTMBENCHOBJS) bin2c phong_frag.h phong_vert.h + + ctmconv: $(CTMCONVOBJS) +- $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml ++ $(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMCONVOBJS) -lopenctm -ltinyxml + + ctmviewer: $(CTMVIEWEROBJS) +- $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \ ++ $(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMVIEWEROBJS) -lopenctm \ + -ltinyxml -ljpeg -lpnglite -lz -lGL -lglut -lGLU -lGLEW \ + -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 + + ctmbench: $(CTMBENCHOBJS) +- $(CXX) $(LDFLAGS) -s -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm ++ $(CXX) $(LDFLAGS) -o $@ -L$(OPENCTMDIR) $(CTMBENCHOBJS) -lopenctm + + %.o: %.cpp + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< diff --git a/media-libs/openctm/openctm-1.0.3.ebuild b/media-libs/openctm/openctm-1.0.3.ebuild index 533f134db5a5..f8d4c157824b 100644 --- a/media-libs/openctm/openctm-1.0.3.ebuild +++ b/media-libs/openctm/openctm-1.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/openctm-1.0.3.ebuild,v 1.4 2014/08/18 23:11:10 amynka Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openctm/openctm-1.0.3.ebuild,v 1.5 2014/08/20 10:58:35 amynka Exp $ EAPI=5 @@ -27,13 +27,9 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PF}" src_prepare() { - epatch "${FILESDIR}"/openctm-fix-makefiles.patch + epatch "${FILESDIR}"/openctm-fix-makefiles.patch \ + "${FILESDIR}"/openctm-no-strip.patch mv Makefile.linux Makefile - - # do not use strip - sed -i -e 's:\(LDFLAGS.*\)-s :\1 :g' \ - "${S}"/Makefile \ - "${S}"/*/Makefile.linux || die } src_compile() { |