From f3ec62e6af22179e04ac73c9e8a54f8d23c3ba31 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Wed, 15 May 2019 02:29:28 -0400
Subject: Install libraries in standard libdir

---
diff --git a/build b/build
index 9292a24..ba387e9 100755
--- a/build
+++ b/build
@@ -65,7 +65,6 @@ bootstrap1_opts = \
 	--disable-libssp
 
 libdir    = /usr/lib/$(OPK_HOST_ARCH)
-gcclibdir = /usr/lib/$(OPK_HOST_ARCH)/gcc-$(base_version)
 tgtlibdir = /usr/lib/$(OPK_HOST_ARCH)/$(target)/gcc-$(base_version)
 tgtincdir = /usr/include/$(target)/c++-$(base_version)
 libsuffix = $$(g++ -print-multi-os-directory)
@@ -182,17 +181,17 @@ $(installnative_targets):
 	mkdir -p $(destdir)$(tgtlibdir)
 	mv $(destdir)$(libdir)/gcc/$(target_gnu)/$(version)/* \
 		$(destdir)$(tgtlibdir)
-	mkdir -p $(destdir)$(gcclibdir)
-	mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(gcclibdir)
+	mkdir -p $(destdir)$(libdir)
+	mv $(destdir)$(libdir)/$(libsuffix)/* $(destdir)$(libdir)
 	mkdir -p $(destdir)$(tgtincdir)
 	mv $(destdir)/usr/include/c++-$(base_version)/$(target_gnu)/* \
 		$(destdir)$(tgtincdir)
 	# Remove libquadmath files.
-	rm -f $(destdir)$(gcclibdir)/libquadmath.*
+	rm -f $(destdir)$(libdir)/libquadmath.*
 	# Remove libtool archives and static libraries.
 	rm -f \
-		$(destdir)$(gcclibdir)/*.la \
-		$(destdir)$(gcclibdir)/*.a \
+		$(destdir)$(libdir)/*.la \
+		$(destdir)$(libdir)/*.a \
 		$(destdir)$(tgtlibdir)/*.la \
 		$(destdir)$(tgtlibdir)/plugin/*.la
 	# Remove the info directory node.
@@ -206,7 +205,7 @@ $(installnative_targets):
 	# target-specific?).
 	rm -Rf $(destdir)$(tgtlibdir)/install-tools/
 	# TODO: Provide these files in a libstdc++-*-dbg package.
-	rm -f $(destdir)$(gcclibdir)/libstdc++.so.*-gdb.py
+	rm -f $(destdir)$(libdir)/libstdc++.so.*-gdb.py
 	rm -Rf $(destdir)/usr/share/gcc-$(version)/python/libstdcxx/
 	# TODO: Provide these files in a doc package.
 	rm -Rf $(destdir)/usr/share/man/ $(destdir)/usr/share/info/
diff --git a/gcc.pkg.in/files b/gcc.pkg.in/files
index 4f1fdc0..efb8be0 100644
--- a/gcc.pkg.in/files
+++ b/gcc.pkg.in/files
@@ -17,11 +17,11 @@
 /usr/lib/*/*/gcc-*/libgcc_eh.a
 /usr/lib/*/gcc-*/libgcc_s.so
 /usr/lib/*/*/gcc-*/libgcov.a
-/usr/lib/*/gcc-*/libgomp.so
-/usr/lib/*/gcc-*/libgomp.spec
-/usr/lib/*/gcc-*/libitm.so
-/usr/lib/*/gcc-*/libitm.spec
-/usr/lib/*/gcc-*/libquadmath.so
-/usr/lib/*/gcc-*/libssp.so
+/usr/lib/*/libgomp.so
+/usr/lib/*/libgomp.spec
+/usr/lib/*/libitm.so
+/usr/lib/*/libitm.spec
+/usr/lib/*/libquadmath.so
+/usr/lib/*/libssp.so
 /usr/lib/*/*/gcc-*/lto-wrapper
 /usr/lib/*/*/gcc-*/lto1
diff --git a/libgcc.1.pkg/files b/libgcc.1.pkg/files
index 071d839..55dfc2f 100644
--- a/libgcc.1.pkg/files
+++ b/libgcc.1.pkg/files
@@ -1 +1 @@
-/usr/lib/*/gcc-*/libgcc_s.so.1
+/usr/lib/*/libgcc_s.so.1
diff --git a/libgomp.1.pkg/files b/libgomp.1.pkg/files
index c92e8c6..7abc3ef 100644
--- a/libgomp.1.pkg/files
+++ b/libgomp.1.pkg/files
@@ -1 +1 @@
-/usr/lib/*/gcc-*/libgomp.so.*
+/usr/lib/*/libgomp.so.*
diff --git a/libitm.1.pkg/files b/libitm.1.pkg/files
index 0e66848..0c58826 100644
--- a/libitm.1.pkg/files
+++ b/libitm.1.pkg/files
@@ -1 +1 @@
-/usr/lib/*/gcc-*/libitm.so.*
+/usr/lib/*/libitm.so.*
diff --git a/libssp.0.pkg/files b/libssp.0.pkg/files
index 457feab..61c8055 100644
--- a/libssp.0.pkg/files
+++ b/libssp.0.pkg/files
@@ -1 +1 @@
-/usr/lib/*/gcc-*/libssp.so.*
+/usr/lib/*/libssp.so.*
diff --git a/libstdc++.6-8-dev.pkg/files b/libstdc++.6-8-dev.pkg/files
index 0799f5b..7031724 100644
--- a/libstdc++.6-8-dev.pkg/files
+++ b/libstdc++.6-8-dev.pkg/files
@@ -1,5 +1,5 @@
 /usr/include/c++-*/
 /usr/include/*/c++-*/
-/usr/lib/*/gcc-*/libstdc++.a
-/usr/lib/*/gcc-*/libstdc++.so
-/usr/lib/*/gcc-*/libsupc++.a
+/usr/lib/*/libstdc++.a
+/usr/lib/*/libstdc++.so
+/usr/lib/*/libsupc++.a
diff --git a/libstdc++.6-8.pkg/files b/libstdc++.6-8.pkg/files
index abe34df..bd5f533 100644
--- a/libstdc++.6-8.pkg/files
+++ b/libstdc++.6-8.pkg/files
@@ -1 +1 @@
-/usr/lib/*/gcc-*/libstdc++.so.6*
+/usr/lib/*/libstdc++.so.6*
--
cgit v0.9.1