- Added pkginfo to .gitignore

- dumpmachine to get the host triplet
- Removed static flags
- Thanks John Vogel

diff --git a/.gitignore b/.gitignore
index e2c796573bb77f053d488a4718c1b20d59f81a13..615a56472b90d94af728a2d0d05f26661620f743 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.8
 *.5
 pkgadd
+pkginfo
 pkgmk
 rejmerge
 

diff --git a/Makefile b/Makefile
index bd733fb284c7a2fb47185449480ee5c23e510648..d7b5072b831044fbd04b66880601d98b763d52f3 100644 (file)
--- 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 00f83612692e4400284b9f804cb545f2d860b74b..482b9b2f3d3874fd5487fab11d2a24da12ded39e 100644 (file)
--- 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"