Browse Source

more patches for musl userland as buildsystem

Waldemar Brodkorb 10 years ago
parent
commit
39a2d17b40
4 changed files with 5 additions and 2 deletions
  1. 1 1
      mk/vars.mk
  2. 1 1
      package/heirloom-cpio/src/Makefile
  3. 1 0
      package/libtool/Makefile
  4. 2 0
      package/xz/Makefile

+ 1 - 1
mk/vars.mk

@@ -187,7 +187,7 @@ endif
 HOST_CPPFLAGS:=		-I$(STAGING_HOST_DIR)/usr/include
 HOST_CFLAGS:=		-O0 -g0 -static-libgcc
 HOST_CXXFLAGS:=		-O0 -g0 -static-libgcc
-HOST_LDFLAGS:=		-L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib
+HOST_LDFLAGS:=		-L$(STAGING_HOST_DIR)/usr/lib -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib -static-libgcc
 
 PATCH=			PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh
 PATCHP0=		PATH=${HOST_PATH} patch -p0

+ 1 - 1
package/heirloom-cpio/src/Makefile

@@ -25,4 +25,4 @@ SRCS:=		ib_open.c \
 		cpio.c
 
 cpio: ${SRCS}
-	$(CC) $(CFLAGS_FOR_BUILD) -D_GNU_SOURCE -I. -o $@ $^
+	$(CC) $(CFLAGS) -D_GNU_SOURCE -I. -o $@ $^

+ 1 - 0
package/libtool/Makefile

@@ -32,6 +32,7 @@ endif
 
 CONFIGURE_ARGS+=	--enable-ltdl-install
 XAKE_FLAGS+=		HELP2MAN=/bin/echo
+HOST_CONFIGURE_ARGS+=	--enable-ltdl-install --disable-shared
 HOST_XAKE_FLAGS+=	HELP2MAN=/bin/echo
 
 libtool-install:

+ 2 - 0
package/xz/Makefile

@@ -30,6 +30,8 @@ $(eval $(call HOST_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBXZ,libxz,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXZ},${PKGSD_LIBXZ},${PKGSC_LIBXZ},${PKG_OPTS}))
 
+HOST_CONFIGURE_ARGS+=	--disable-shared
+
 xz-install:
 	${INSTALL_DIR} ${IDIR_XZ}/usr/bin
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin