diff --git a/Makefile b/Makefile index da00ccd..e98dd51 100644 --- a/Makefile +++ b/Makefile @@ -9,14 +9,15 @@ # GNU General Public License for more details. export SRCPKG = gcc -export DEPENDS = glibc,gmp,libgcc,libstdc++,mpc,mpfr,zlib +export DEPENDS = dash,glibc,gmp,libgcc,libstdc++,mpc,mpfr,zlib export ARCH = x86_64 export URL = https://gcc.gnu.org/ +REPO = dev BRIEF = GNU compiler collection 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 = 2 +SLVER = 3 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -25,14 +26,14 @@ PATCHDIR := $(PWD)/SRC/patches BUILDDIR := $(PWD)/BUILD MACHINE := $(gcc -dumpmachine) export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \ - sed 's/^-//')-$(SNAPVER) + sed 's/^-//')-$(SLVER) LIBGCC := $(PWD)/libgcc LIBGCCROOT := $(LIBGCC)/ROOT LIBSTDC := $(PWD)/libstdc++ LIBSTDCROOT := $(LIBSTDC)/ROOT -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) @echo "Extracting archive..." @@ -93,17 +94,17 @@ $(ROOT): $(BUILDDIR)/gcc $(ROOT)/usr/share/gdb/auto-load/usr/lib && \ rm -v $(ROOT)/usr/share/info/dir - @install -v -d $(LIBGCC)/SNAP && \ + @install -v -d $(LIBGCC)/SL && \ install -v -d $(LIBGCCROOT) && \ - install -v -d $(LIBSTDC)/SNAP && \ + install -v -d $(LIBSTDC)/SL && \ install -v -d $(LIBSTDCROOT) && \ install -v -d -m 755 $(LIBGCCROOT)/usr/lib && \ install -v -d -m 755 $(LIBSTDCROOT)/usr/lib && \ mv -v $(ROOT)/usr/lib64/libgcc_s.so* $(LIBGCCROOT)/usr/lib && \ mv -v $(ROOT)/usr/lib64/libstdc++* $(LIBSTDCROOT)/usr/lib && \ find $(ROOT) -type d -empty -delete && \ - cd $(LIBGCC) && make -f ../Makefile.libgcc && mv *.snap ../ && \ - cd $(LIBSTDC) && make -f ../Makefile.libstdc++ && mv *.snap ../ + cd $(LIBGCC) && make -f ../Makefile.libgcc && mv *.slp ../ && \ + cd $(LIBSTDC) && make -f ../Makefile.libstdc++ && mv *.slp ../ test: $(ROOT) @cd $(BUILDDIR); \ @@ -113,7 +114,7 @@ clean: @rm -rvf $(ROOT) \ $(LIBGCC) \ $(LIBSTDC) \ - $(SNAPINFO) \ + $(SLINFO) \ $(MANIFEST) \ $(FILES) \ $(SRCDIR) \ diff --git a/Makefile.libgcc b/Makefile.libgcc index a7854b4..6e718a8 100644 --- a/Makefile.libgcc +++ b/Makefile.libgcc @@ -8,8 +8,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = glibc +REPO = main BRIEF = Run time library for some gcc compiled binaires DESC = Run time library for some gcc compiled binaires -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/Makefile.libstdc++ b/Makefile.libstdc++ index 60b81fa..c6eefcf 100644 --- a/Makefile.libstdc++ +++ b/Makefile.libstdc++ @@ -8,8 +8,9 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = glibc,libgcc +REPO = main BRIEF = Run time library for C++ binaries DESC = Run time library for C++ binaries -include /usr/share/snap/Makefile.snaplinux +include /usr/share/sl/Makefile.snaplinux diff --git a/SNAP/README b/SL/README similarity index 100% rename from SNAP/README rename to SL/README