From 72562ad240255c629910fa5e0fd0fbc82e602010 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Sat, 14 May 2016 01:25:37 +0000 Subject: [PATCH] - Added pkginfo to .gitignore - dumpmachine to get the host triplet - Removed static flags - Thanks John Vogel --- .gitignore | 1 + Makefile | 4 ++-- pkgmk-cross.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e2c7965..615a564 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.8 *.5 pkgadd +pkginfo pkgmk rejmerge diff --git a/Makefile b/Makefile index bd733fb..d7b5072 100644 --- a/Makefile +++ b/Makefile @@ -32,9 +32,9 @@ CXXFLAGS += -DNDEBUG CXXFLAGS += -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LIBARCHIVELIBS := $(shell pkg-config --libs --static libarchive) +LIBARCHIVELIBS := $(shell pkg-config --libs libarchive) -LDFLAGS += -static $(LIBARCHIVELIBS) +LDFLAGS += $(LIBARCHIVELIBS) OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o diff --git a/pkgmk-cross.conf b/pkgmk-cross.conf index 00f8361..482b9b2 100644 --- a/pkgmk-cross.conf +++ b/pkgmk-cross.conf @@ -2,7 +2,7 @@ # pkgmk.conf: pkgmk(8) configuration # -export CHOST="$(echo $MACHTYPE)" +export CHOST="$(gcc -dumpmachine)" # hardfp (mainline) export CTARGET="arm-crux-linux-gnueabihf" -- 2.26.2