oss: Fix -Werror, LDFLAGS and stripping properly

(Portage version: 2.2.0_alpha45/git/Linux x86_64, signed Manifest commit with key 84F20B43)

3 files changed, 73 insertions, 17 deletions

diff --git a/media-sound/oss/Manifest b/media-sound/oss/Manifest
index 881425c..a51b2b3 100644
--- a/media-sound/oss/Manifest
+++ b/media-sound/oss/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX oss-4.2.2004-as-needed-strip.patch 2597 RMD160 4948e06fa2f42b7e9d7272a3f293c02693150bb5 SHA1 30eae3caaadadf17d50236d60e5692c25544900f SHA256 1dbe483d08ba25380791f9637b6c95235f71091fd1480580979d72ca4e9c2b6e
 AUX oss-4.2.2004-filesystem-layout.patch 6703 RMD160 fee44548032c6fd88ddff2a90e514b997918d797 SHA1 33aae9b12ca5cd0bd34beb105ed8ed77da2c207f SHA256 552b5ffc08dfa8bda20d12febcfcf9e66919dec6fb4f21c88e64415b1488c81d
 AUX oss-4.2.2004-txt2man.patch 340 RMD160 9211cd9f851843f1354ee6a8eddfab2fe04e3409 SHA1 df56f9001f11a0cb3552c37212ba7732e9640f08 SHA256 66b3895c68a58d419c004240fb915539c32e73f199fc36dcbfd9aa71f4dde28f
 DIST oss-v4.2-build2004-src-gpl.tar.bz2 1790085 RMD160 7b62cb96bf363d1c0a4018e21b0737ec5ee3c5b5 SHA1 75c3ff1cf3e3bd5b351b1f778100387f998c7f3a SHA256 6a4ac364c6ed022467b23a9db137857afa9f8e9706a4bdbcb85b98efcde3f4a0
-EBUILD oss-4.2.2004.ebuild 2577 RMD160 2410a1c17b73ea516a81b4f71fa695d5ba457b84 SHA1 4b514c3c862c34ee5696ec2cbeb27db927107c4a SHA256 556c02ad4656656e745256c7b3b73517c48c4f438e9b146a2de55d8295fb086b
+EBUILD oss-4.2.2004.ebuild 2423 RMD160 a10f881c2581e22ee1ca32b3c1fd960d82fb64d4 SHA1 cd5599f20723f276e7eec9fbb02d992501272e3f SHA256 a6154d5bacd9f2215c40e285b8c66cd6296d1320d9be7a366df923425ba2a59b
 MISC metadata.xml 227 RMD160 1f3fcf9c4a4cba1f09f4fa4d0869d03049a1da52 SHA1 4022447d941f3158cfd612046c05a97494a8e1e4 SHA256 8f4b64f252a02a2209f8573a0c8cfa3d15ecb413eb8b3bd49fbd06890699dc63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4fV0QACgkQmWq1bYTyC0P8IgD/S+Mbz9cJ3Fq+sl/d/waK1V45
-DDWLWd1R+MLZeyztoXgBAJPaKb3TR4LmeJk52DNSsYcFLaHGUlG+DosFIaOyQ/j9
-=xCf/
+iF4EAREIAAYFAk4fX20ACgkQmWq1bYTyC0MIfQEAirMKdjgxCYyxuhgmxaC5amn5
+k7WNMFHlQmbKAfeJ738BALIY60/CjAZjWFWIOOX4jbn8vgHH5P7zMi3fy7sMvKNR
+=8QCy
 -----END PGP SIGNATURE-----
diff --git a/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch b/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
new file mode 100644
index 0000000..211028c
--- /dev/null
+++ b/media-sound/oss/files/oss-4.2.2004-as-needed-strip.patch
@@ -0,0 +1,65 @@
+diff --git a/lib/libOSSlib/Makefile b/lib/libOSSlib/Makefile
+index 98029f1..a9bd175 100644
+--- a/lib/libOSSlib/Makefile
++++ b/lib/libOSSlib/Makefile
+@@ -1,6 +1,6 @@
+ OBJS=libmain.o midiparser.o play_event.o
+ INSTALLLIB=/lib
+-LDFLAGS=-shared -fPIC
++LDFLAGS+=-shared -fPIC
+ CFLAGS=-O -fPIC
+ #LDFLAGS=-Bdynamic
+ AROPTS=rc
+diff --git a/lib/libsalsa/Makefile b/lib/libsalsa/Makefile
+index 5f8216b..863ba7f 100644
+--- a/lib/libsalsa/Makefile
++++ b/lib/libsalsa/Makefile
+@@ -46,7 +46,7 @@ rawmidi.lo:	rawmidi.c
+ 		$(LIBTOOL) --mode=compile ${CC} $(CFLAGS) -c rawmidi.c 
+ 
+ libsalsa.la:   $(LOBJECTS)
+-		$(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LOBJECTS) -L../libOSSlib -lOSSlib
++		$(LIBTOOL) --mode=link ${CC} -rpath /usr/lib -Wl,--version-script=Versions -version-info 2:0:0 -o libsalsa.la $(LDFLAGS) $(LOBJECTS) -L../libOSSlib -lOSSlib
+ 
+ install:	libsalsa.la
+ 		$(LIBTOOL) cp libsalsa.la /usr/lib
+diff --git a/setup/srcconf.c b/setup/srcconf.c
+index 241c590..85bac58 100644
+--- a/setup/srcconf.c
++++ b/setup/srcconf.c
+@@ -928,7 +928,7 @@ printf("Symlink %s -> %s\n", source, target);
+     fprintf (f, "CFLAGS=%s\n", conf.cflags);
+ #endif
+   if (*conf.ldflags != 0)
+-    fprintf (f, "LDFLAGS=%s\n", conf.ldflags);
++    fprintf (f, "LDFLAGS+=%s\n", conf.ldflags);
+ 
+   if (strcmp(conf.endianess, "UNKNOWN") != 0)
+      sprintf (tmp_endian, " -DOSS_%s_ENDIAN", conf.endianess);
+@@ -1170,7 +1170,7 @@ printf("Symlink %s -> %s\n", source, target);
+ 
+       fprintf (f, "$(BINDIR)/%s:\t$(OBJECTS)\n", name);
+       fprintf (f,
+-	       "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(BINDIR)/%s $(OBJECTS) %s\n",
++	       "\t$(CC) $(CFLAGS) -o $(BINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+ 	       name, extra_libraries);
+       fprintf (f, "\n\n");
+     }
+@@ -1199,7 +1199,7 @@ printf("Symlink %s -> %s\n", source, target);
+ 
+       fprintf (f, "$(SBINDIR)/%s:\t$(OBJECTS)\n", name);
+       fprintf (f,
+-	       "\t$(CC) $(CFLAGS) $(LIBRARIES) $(LDFLAGS) -s -o $(SBINDIR)/%s $(OBJECTS) %s\n",
++	       "\t$(CC) $(CFLAGS) -o $(SBINDIR)/%s $(OBJECTS) %s $(LIBRARIES) $(LDFLAGS)\n",
+ 	       name, extra_libraries);
+       fprintf (f, "\n\n");
+     }
+@@ -1226,7 +1226,7 @@ printf("Symlink %s -> %s\n", source, target);
+ 		     obj_src[i], objdir, objects[i]);
+ 	  else
+ 	    fprintf (f,
+-		     "\t$(CC) -c $(CFLAGS) $(OSFLAGS) $(LIBRARIES) $(INCLUDES) %s -o $(%s)/%s\n",
++		     "\t$(CC) -c $(CFLAGS) $(OSFLAGS) $(INCLUDES) %s -o $(%s)/%s $(LIBRARIES)\n",
+ 		     obj_src[i], objdir, objects[i]);
+ 	  fprintf (f, "\n");
+ 	}
diff --git a/media-sound/oss/oss-4.2.2004.ebuild b/media-sound/oss/oss-4.2.2004.ebuild
index fcc903f..b651a1c 100644
--- a/media-sound/oss/oss-4.2.2004.ebuild
+++ b/media-sound/oss/oss-4.2.2004.ebuild
@@ -33,7 +33,8 @@ src_prepare() {
 	# the build system forces shadow builds
 	mkdir "${BUILD_DIR}"
 	epatch "${FILESDIR}"/${P}-filesystem-layout.patch \
-		"${FILESDIR}"/${P}-txt2man.patch
+		"${FILESDIR}"/${P}-txt2man.patch \
+		"${FILESDIR}"/${P}-as-needed-strip.patch
 }
 
 src_configure() {
@@ -44,12 +45,10 @@ src_configure() {
 	use salsa || myconf="--enable-libsalsa=NO"
 
 	HOSTCC=$(tc-getCC) \
+	NO_WARNING_CHECKS=1 \
 	"${S}"/configure \
 		--config-midi=YES \
 		${myconf} || die
-
-	find -name Makefile -exec sed -e "s:-Werror::" \
-		-e "s:-Wall::" -i {} +
 }
 
 src_compile() {
@@ -66,20 +65,11 @@ src_compile() {
 		sed -e "s:ossxmix::" -i Makefile
 	fi
 
-	# disable stripping
-	sed -e "s:-s::" \
-		-i */Makefile
-		#-e "s:LDFLAGS=:LDFLAGS+=:" \
-
 	einfo "Building applications"
 	emake CC=$(tc-getCC)
 	popd
 
 	pushd os_cmd/Linux
-	# disable stripping
-	sed -e "s:-s::" \
-		-i */Makefile
-
 	einfo "Building ossdetect/ossvermagic"
 	emake CC=$(tc-getCC)
 	popd