webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Zwischencommit fuer LFS.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@318 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-10-13 11:51:11 +00:00
parent 6b8cff4166
commit ddac608770
13 changed files with 1945 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/freetype
View File

@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h cd $(DIR_APP) && sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

8
lfs/gd
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is # # Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> # # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# # # #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: gd,v 1.5.2.4 2005/03/04 19:26:50 gespinasse Exp $
# #
############################################################################### ###############################################################################
############################################################################### ###############################################################################
@@ -79,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

2
lfs/lcms
View File

@@ -73,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

5
lfs/libjpeg
View File

@@ -54,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects)) md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
############################################################################### ###############################################################################
# Downloading, checking, md5sum # Downloading, checking, md5sum
############################################################################### ###############################################################################
@@ -78,7 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

7
lfs/libmng
View File

@@ -72,11 +72,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && cp makefiles/makefile.linux Makefile && make cd $(DIR_APP) && cp makefiles/makefile.linux Makefile
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make prefix=/usr install cd $(DIR_APP) && make prefix=/usr install
# cd $(DIR_APP) && install -v -m644 doc/man/*.3 /usr/share/man/man3
# cd $(DIR_APP) && install -v -m644 doc/man/*.5 /usr/share/man/man5
# cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/libmng-1.0.9
# cd $(DIR_APP) && install -v -m644 doc/*.{png,txt} /usr/share/doc/libmng-1.0.9
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

10
lfs/libnet
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is # # Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> # # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# # # #
# Modifications by: #
# 23-4-2004 Mark Wormgoor <mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
#
# #
############################################################################### ###############################################################################
############################################################################### ###############################################################################
@@ -36,7 +30,7 @@ VER = 1.1.2.1
THISAPP = libnet-$(VER) THISAPP = libnet-$(VER)
DL_FILE = libnet.tar.gz DL_FILE = libnet.tar.gz
DL_FROM = http://www.packetfactory.net/libnet/dist DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/libnet DIR_APP = $(DIR_SRC)/libnet
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
@@ -79,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

5
lfs/libpng
View File

@@ -72,9 +72,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpng-1.2.12-no-asm.patch cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && ./configure --prefix=/usr --disable-static --without-libpng-compat cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

9
lfs/libtiff
View File

@@ -30,11 +30,9 @@ VER = 3.8.2
THISAPP = tiff-$(VER) THISAPP = tiff-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
DL_FROM = ftp://ftp.remotesensing.org/libtiff DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libtiff
PAK_VER = ipfire-beta1
############################################################################### ###############################################################################
# Top-level Rules # Top-level Rules
@@ -54,9 +52,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects)) md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
############################################################################### ###############################################################################
# Downloading, checking, md5sum # Downloading, checking, md5sum
############################################################################### ###############################################################################
@@ -78,7 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

8
lfs/popt
View File

@@ -26,7 +26,7 @@
include Config include Config
VER = 1.7 VER = 1.10.4
THISAPP = popt-$(VER) THISAPP = popt-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5988e7aeb0ae4dac8d83561265984cc9 $(DL_FILE)_MD5 = dd22a6873b43d00f75e1c1b7dcfd1ff7
install : $(TARGET) install : $(TARGET)
@@ -72,8 +72,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i -e "/*origOptString ==/c 0)" popt.c
cd $(DIR_APP) && autoreconf -f -i
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

19
lfs/python
View File

@@ -18,12 +18,6 @@
# Makefiles are based on LFSMake, which is # # Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> # # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# # # #
# Modifications by: #
# ??-12-2003 Mark Wormgoor < mark@wormgoor.com> #
# - Modified Makefile for IPCop build #
# #
# $Id: python,v 1.5.2.4 2005/02/05 15:38:15 gespinasse Exp $
# #
############################################################################### ###############################################################################
############################################################################### ###############################################################################
@@ -32,11 +26,11 @@
include Config include Config
VER = 2.3.4 VER = 2.4.3
THISAPP = Python-$(VER) THISAPP = Python-$(VER)
DL_FILE = $(THISAPP).tgz DL_FILE = $(THISAPP).tar.bz2
DL_FROM = http://www.python.org/ftp/python/$(VER) DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
@@ -48,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b6cf0b19226861a38689d2fabd0931b3 $(DL_FILE)_MD5 = 141c683447d5e76be1d2bd4829574f02
install : $(TARGET) install : $(TARGET)
@@ -78,8 +72,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD) @$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --disable-nls cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
cd $(DIR_APP) && make -j 3 cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install cd $(DIR_APP) && make install
@rm -rf $(DIR_APP) @rm -rf $(DIR_APP)
@$(POSTBUILD) @$(POSTBUILD)

4
make.sh
View File

@@ -368,14 +368,15 @@ buildipfire() {
ipfiremake openssl ipfiremake openssl
ipfiremake python ipfiremake python
ipfiremake libnet ipfiremake libnet
ipfiremake libjpeg
ipfiremake libpng ipfiremake libpng
ipfiremake libtiff ipfiremake libtiff
ipfiremake libjpeg
ipfiremake lcms ipfiremake lcms
ipfiremake libmng ipfiremake libmng
ipfiremake freetype ipfiremake freetype
ipfiremake gd ipfiremake gd
ipfiremake popt ipfiremake popt
exit 1 # Bis hierhin l<>ufts :D
ipfiremake slang ipfiremake slang
ipfiremake newt ipfiremake newt
ipfiremake libcap ipfiremake libcap
@@ -660,7 +661,6 @@ ipfirepackages() {
ipfiredist lame ipfiredist lame
ipfiredist libmad ipfiredist libmad
ipfiredist libogg ipfiredist libogg
ipfiredist libtiff
ipfiredist libvorbis ipfiredist libvorbis
ipfiredist mailx ipfiredist mailx
ipfiredist mldonkey ipfiredist mldonkey

32
src/patches/Python-2.4.3-gdbm-1.patch Normal file
View File

@@ -0,0 +1,32 @@
Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
Date: 2003-12-26
Initial Package Version: 2.3.3
Origin: Greg Schafer and Jim Gifford
Description: Fixes Python build issue with gdbm
*** WARNING: renaming "dbm" since importing it failed:
build/lib.linux-i686-2.3/dbm.so: undefined symbol: dbm_firstkey
$LastChangedBy: dnicholson $
$Date: 2006-04-20 10:08:34 -0600 (Thu, 20 Apr 2006) $
diff -Naur Python-2.3.2.orig/setup.py Python-2.3.2/setup.py
--- Python-2.3.2.orig/setup.py 2003-09-22 01:19:45.000000000 +0000
+++ Python-2.3.2/setup.py 2003-10-13 06:28:34.000000000 +0000
@@ -596,12 +596,12 @@
if self.compiler.find_library_file(lib_dirs, 'ndbm'):
ndbm_libs = ['ndbm']
else:
- ndbm_libs = []
+ ndbm_libs = ['gdbm', 'gdbm_compat']
exts.append( Extension('dbm', ['dbmmodule.c'],
define_macros=[('HAVE_NDBM_H',None)],
libraries = ndbm_libs ) )
elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
- and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
+ and find_file("ndbm.h", inc_dirs, []) is not None):
exts.append( Extension('dbm', ['dbmmodule.c'],
define_macros=[('HAVE_GDBM_NDBM_H',None)],
libraries = ['gdbm'] ) )

1887
src/patches/openssl-0.9.8d-fix_manpages-1.patch Normal file
View File

File diff suppressed because it is too large Load Diff