Fix windows builds, add strip target for makefiles, update distro build makefiles...

[xonotic/gmqcc.git] / distro / archlinux / this / Makefile

diff --git a/distro/archlinux/this/Makefile b/distro/archlinux/this/Makefile
index 6e7c5c1bf8efbb610903a7fc4764b6debf91934e..f22410369516b597669668391864175bd7690c44 100644 (file)
--- a/distro/archlinux/this/Makefile
+++ b/distro/archlinux/this/Makefile
@@ -7,11 +7,23 @@ PATCH   := $(shell sed -n -e '/GMQCC_VERSION_PATCH/{s/.* .* //;p;q;}' $(HEADER))
 PKGREL  := 1
 CARCH   := $(shell uname -m)
 PKGDIR  := gmqcc-$(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)-$(CARCH)
+TARCOMP := -J
 PKG     := $(PKGDIR).pkg.tar.xz
 PKGINFO := $(PKGDIR)/.PKGINFO
+DESTDIR := distro/archlinux/this
+CFLAGS  :=
 
-base: clean
-       $(MAKE) -C $(BASEDIR) DESTDIR=distro/arch/this/$(PKGDIR) PREFIX=$(PREFIX) CFLAGS+=-m64 install
+LIBC_DEPEND := glibc
+
+ifneq (, $(findstring i686, $(CARCH)))
+       CFLAGS += -m32
+       LDFLAGS += -m32
+endif
+
+base:
+       $(MAKE) -C $(BASEDIR) clean
+       CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+         $(MAKE) -C $(BASEDIR) "DESTDIR=$(DESTDIR)/$(PKGDIR)" "PREFIX=$(PREFIX)" strip install
        @echo "pkgname = gmqcc" > $(PKGINFO)
        @echo "pkgver = $(MAJOR).$(MINOR).$(PATCH)-$(PKGREL)" >> $(PKGINFO)
        @echo "pkgdesc = An Improved Quake C Compiler" >> $(PKGINFO)
@@ -22,7 +34,7 @@ base: clean
        @echo "arch = $(CARCH)" >> $(PKGINFO)
        @echo "license = MIT" >> $(PKGINFO)
        @echo "conflict = gmqcc" >> $(PKGINFO)
-       @echo "depend = glibc" >> $(PKGINFO)
+       @echo "depend = $(LIBC_DEPEND)" >> $(PKGINFO)
        @echo "makepkgopt = strip" >> $(PKGINFO)
        @echo "makepkgopt = docs" >> $(PKGINFO)
        @echo "makepkgopt = libtool" >> $(PKGINFO)
@@ -30,11 +42,15 @@ base: clean
        @echo "makepkgopt = zipman" >> $(PKGINFO)
        @echo "makepkgopt = purge" >> $(PKGINFO)
        @echo "makepkgopt = !upx" >> $(PKGINFO)
-       @tar -cJvf $(PKG) -C $(PKGDIR)/ .PKGINFO usr/
+       @bsdtar -C $(PKGDIR) -czf $(PKGDIR)/.MTREE \
+           --format=mtree \
+           --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' \
+           .PKGINFO usr/
+       @bsdtar $(TARCOMP) -cvf $(PKG) -C $(PKGDIR)/ .PKGINFO .MTREE usr/
        @rm -rf $(PKGDIR)
 
 clean:
-       @rm -f  $(PKG)
-
+       $(MAKE) -C $(BASEDIR) clean
+       @rm -f *.pkg.tar.xz
 
 all: base