mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-09 18:45:54 +02:00
Busybox war gegen falsche Libc gelinkt.
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@340 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
@@ -36,8 +36,8 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
|
||||
# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
|
||||
# CONFIG_FEATURE_SHARED_BUSYBOX is not set
|
||||
# CONFIG_LFS is not set
|
||||
# USING_CROSS_COMPILER is not set
|
||||
CROSS_COMPILER_PREFIX=""
|
||||
USING_CROSS_COMPILER=y
|
||||
CROSS_COMPILER_PREFIX="/opt/i586-uClibc/bin/i586-linux-"
|
||||
# CONFIG_BUILD_AT_ONCE is not set
|
||||
|
||||
#
|
||||
@@ -53,7 +53,7 @@ CROSS_COMPILER_PREFIX=""
|
||||
#
|
||||
# Installation Options
|
||||
#
|
||||
# CONFIG_INSTALL_NO_USR is not set
|
||||
CONFIG_INSTALL_NO_USR=y
|
||||
CONFIG_INSTALL_APPLET_SYMLINKS=y
|
||||
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
|
||||
# CONFIG_INSTALL_APPLET_DONT is not set
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
###############################################################################
|
||||
# This file is part of the IPCop Firewall. #
|
||||
# #
|
||||
|
||||
@@ -90,7 +90,7 @@ ifeq "$(LFS_PASS)" "install"
|
||||
|
||||
cd $(DIR_APP)/lib/uuid && make
|
||||
cd $(DIR_APP)/lib/uuid && make install
|
||||
cd $(DIR_APP)/lib/uuid && install -m 755 libuuid.a /opt/$(MACHINE)-uClibc/lib
|
||||
cd $(DIR_APP)/lib/uuid && install -m 755 libuuid.a /opt/$(MACHINE)-uClibc/lib/libuuid.a
|
||||
cd $(DIR_APP) && unset LD_LIBRARY_PATH
|
||||
else
|
||||
cd $(DIR_SRC) && mkdir build
|
||||
|
||||
2
lfs/newt
2
lfs/newt
@@ -86,7 +86,7 @@ ifeq "$(LFS_PASS)" "install"
|
||||
cd $(DIR_APP) && sed -i 's%^CFLAGS.*$$%CFLAGS = -Os -fomit-frame-pointer -Wall -D_GNU_SOURCE -DUTF8 -I/install/include/slang%' Makefile
|
||||
cd $(DIR_APP) && make libnewt.a
|
||||
-mkdir -p /install/$(MACHINE)-uClibc/{include,lib}
|
||||
cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib
|
||||
cd $(DIR_APP) && install -m 0644 libnewt.a /install/$(MACHINE)-uClibc/lib/libnewt.a
|
||||
cd $(DIR_APP) && install -m 0644 newt.h /install/$(MACHINE)-uClibc/include/newt.h
|
||||
else
|
||||
cd $(DIR_APP) && RPM_OPT_FLAGS="$(CFLAGS) -DUTF8" ./configure --without-gpm-support
|
||||
|
||||
@@ -77,7 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
@$(PREBUILD)
|
||||
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
|
||||
ifeq "$(LFS_PASS)" "install"
|
||||
-mkdir -p /install/lib
|
||||
cd $(DIR_APP) && ./configure --prefix=""
|
||||
cd $(DIR_APP) && make $(MAKETUNING) elf
|
||||
cd $(DIR_APP)/src && make install-elf DESTDIR="/opt/$(MACHINE)-uClibc"
|
||||
|
||||
@@ -95,5 +95,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
cd /lib && ln -sf ld-uClibc-$(VER).so ld-uClibc.so.0
|
||||
cd /lib && ln -sf libuClibc-$(VER).so libc.so.0
|
||||
cd /lib && ln -sf libc.so.0 libc.so
|
||||
@rm -rf $(DIR_SRC)/buildroot
|
||||
@rm -rf $(DIR_APP) $(DIR_SRC)/buildroot
|
||||
@$(POSTBUILD)
|
||||
|
||||
@@ -412,7 +412,7 @@ installmake() {
|
||||
local PKG_TIME_START=`date +%s`
|
||||
chroot $LFS /tools/bin/env -i HOME=/root \
|
||||
TERM=$TERM PS1='\u:\w\$ ' \
|
||||
PATH=/usr/local/bin:/opt/$MACHINE-uClibc/usr/bin:/bin:/usr/bin:/sbin:/usr/sbin \
|
||||
PATH=/opt/$MACHINE-uClibc/bin:/bin:/usr/bin:/sbin:/usr/sbin \
|
||||
VERSION=$VERSION \
|
||||
CONFIG_ROOT=$CONFIG_ROOT \
|
||||
LFS_PASS="install" \
|
||||
|
||||
Reference in New Issue
Block a user