Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Revert "fix cross compilation"
Baptiste Daroussin committed 6 years ago
commit c5267360a42f1843c2a52b94e7e91dcab1db5516
parent fad0a4a
3 files changed +4 -5
modified libpkg/Makefile.autosetup
@@ -158,8 +158,8 @@ install: all pkg.h lib$(LIB)$(LIBSOEXT) lib$(LIB).a
	install -d -m 755 $(DESTDIR)$(libdir)
	install -d -m 755 $(DESTDIR)$(includedir)
	install -d -m 755 $(DESTDIR)$(pkgconfigdir)
-
	install -s --strip-program $(STRIP) -m 644 lib$(LIB)$(LIBSOEXT) $(DESTDIR)$(libdir)/
+
	install -s -m 644 lib$(LIB)$(LIBSOEXT) $(DESTDIR)$(libdir)/
	ln -sf lib$(LIB)$(LIBSOEXT) $(DESTDIR)$(libdir)/lib$(LIB)$(SH_SOEXT)
-
	install -s --strip-program $(STRIP) -m 644 lib$(LIB).a $(DESTDIR)$(libdir)/
+
	install -s -m 644 lib$(LIB).a $(DESTDIR)$(libdir)/
	install -m 644 pkg.h $(DESTDIR)$(includedir)/
	install -m 644 pkg.pc $(DESTDIR)$(pkgconfigdir)
modified mk/defs.mk.in
@@ -1,7 +1,6 @@
RANLIB=	@RANLIB@
AR=	@AR@
CC=	@CC@
-
STRIP=	@STRIP@
@if coverage == "1"
CFLAGS+=	@COVERAGE_CFLAGS@
LDFLAGS+=	@COVERAGE_LDFLAGS@
modified src/Makefile.autosetup
@@ -88,7 +88,7 @@ pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat.a

install-static: pkg-static
	install -d -m 755 $(DESTDIR)$(sbindir)
-
	install -s --strip-program $(STRIP) -m 755 pkg-static $(DESTDIR)$(sbindir)/pkg-static
+
	install -s -m 755 pkg-static $(DESTDIR)$(sbindir)/pkg-static
@endif

${OBJS}: $(top_builddir)/pkg_config.h
@@ -97,7 +97,7 @@ $(PROG): $(top_builddir)/libpkg/libpkg_flat.a

install: $(PROG)
	install -d -m 755 $(DESTDIR)$(sbindir)
-
	install -s --strip-program $(STRIP) -m 755 pkg $(DESTDIR)$(sbindir)/pkg
+
	install -s -m 755 pkg $(DESTDIR)$(sbindir)/pkg
	install -m 644 pkg.conf.sample $(DESTDIR)$(etcdir)

clean: clean-pkg-static