From 64d78c5c4705c5d463975527b4cec465732784f7 Mon Sep 17 00:00:00 2001
From: Jay Larson <jlarson@snaplinux.org>
Date: Wed, 2 Nov 2016 09:22:34 -0500
Subject: [PATCH] Removed usr/share/info/dir, removed creation of lib64
 symlinks, and cleaned up Makefile

---
 Makefile | 43 ++++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index baa829f..537c9c7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,13 +8,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
+DEPENDS = glibc,gmp,mpc,mpfr,zlib
 ARCH = x86_64
 URL = https://gcc.gnu.org/
 DESC = The GNU Compiler Collection includes front ends for C, C++, \
 Objective-C, Fortran, Java, Ada, and Go, as well as libraries for these \
 languages (libstdc++, libgcj,...).
-SNAPVER = sr0
+SNAPVER = sr1
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
@@ -24,20 +24,6 @@ BUILDDIR := $(PWD)/BUILD
 VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
 MACHINE := $(gcc -dumpmachine)
 
-MAKE = make
-MAKEINST = make install
-SNAPHACKS = mkdir -pv $(ROOT)/lib && \
-	mv -v $(ROOT)/usr/lib64/* $(ROOT)/usr/lib && \
-	rmdir $(ROOT)/usr/lib64 && \
-	ln -sfv lib $(ROOT)/usr/lib64 && \
-	ln -sv ../usr/bin/cpp $(ROOT)/lib/cpp && \
-	ln -sv gcc $(ROOT)/usr/bin/cc && \
-	install -v -dm755 $(ROOT)/usr/lib/bfd-plugins && \
-	ln -sfv ../../libexec/gcc/$(MACHINE)/$(VERSION)/liblto_plugin.so \
-		$(ROOT)/usr/lib/bfd-plugins && \
-	mkdir -pv $(ROOT)/usr/share/gdb/auto-load/usr/lib && \
-	mv -v $(ROOT)/usr/lib/*gdb.py $(ROOT)/usr/share/gdb/auto-load/usr/lib
-
 include /usr/share/snap/Makefile.snaplinux
 
 $(SRCDIR)/configure: $(ARCHIVE)
@@ -57,12 +43,13 @@ $(SRCDIR)/configure: $(ARCHIVE)
 	@touch $(SRCDIR)/configure
 
 $(BUILDDIR)/config.log: $(SRCDIR)/configure
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np1 -i $$patch; \
+	done
 	@if [ ! -d $(BUILDDIR) ]; then \
 		mkdir -v $(BUILDDIR); \
 	fi
-	@if [ -f $(PATCHDIR)/*.patch ]; then \
-		cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \
-	fi
 	@cd $(BUILDDIR); \
 	../$(SRCDIR)/configure \
 		--prefix=/usr \
@@ -77,8 +64,7 @@ $(BUILDDIR)/config.log: $(SRCDIR)/configure
 		--target=x86_64-snap-linux-gnu
 
 $(BUILDDIR)/gcc: $(BUILDDIR)/config.log
-	@cd $(BUILDDIR); \
-	$(MAKE)
+	@cd $(BUILDDIR) && make
 
 $(ROOT): $(BUILDDIR)/gcc
 	@if [ -d $(ROOT) ]; then \
@@ -87,10 +73,17 @@ $(ROOT): $(BUILDDIR)/gcc
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(BUILDDIR); \
-	$(MAKEINST) DESTDIR=$(ROOT)
-
-	@$(SNAPHACKS)
+	@cd $(BUILDDIR) && make install DESTDIR=$(ROOT) && \
+	install -v -d -m 755 $(ROOT)/lib && \
+	ln -sv /usr/bin/cpp $(ROOT)/lib/cpp && \
+	ln -sv gcc $(ROOT)/usr/bin/cc && \
+	install -v -dm755 $(ROOT)/usr/lib64/bfd-plugins && \
+	ln -sfv ../../libexec/gcc/$(MACHINE)/$(VERSION)/liblto_plugin.so \
+		$(ROOT)/usr/lib64/bfd-plugins && \
+	mkdir -pv $(ROOT)/usr/share/gdb/auto-load/usr/lib && \
+	mv -v $(ROOT)/usr/lib64/*gdb.py \
+		$(ROOT)/usr/share/gdb/auto-load/usr/lib && \
+	rm -v $(ROOT)/usr/share/info/dir
 
 test: $(ROOT)
 	@cd $(BUILDDIR); \