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

Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into arm-port

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-09-07 12:15:08 +00:00
parent 2f5e1d4358 bb48bae92a
commit 686329769e
9 changed files with 123 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/directfb
View File

@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && sed -i "s/checkfor_matrox=yes/checkfor_matrox=no/g" configure
cd $(DIR_APP) && sed -i "s/checkfor_cle266=no/checkfor_cle266=yes/g" configure
cd $(DIR_APP) && sed -i "s/checkfor_omap=.*/checkfor_omap=no/g" configure
cd $(DIR_APP) && ./configure --prefix=/usr --disable-x11 --enable-sdl \
--enable-video4linux2
cd $(DIR_APP) && make $(MAKETUNING)

4
lfs/mysql
View File

@@ -34,10 +34,6 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mysql
PAK_VER = 1
ifeq "$(MACHINE)" "arm"
MAKETUNING = -j1
endif
###############################################################################
# Top-level Rules
###############################################################################

4
lfs/python-lzma
View File

@@ -80,8 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && python setup.py install
# unzip the egg because it won't work without
cd /usr/lib/python2.7/site-packages && \
unzip pyliblzma-$(VER)-py2.7-linux-i686.egg
rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-i686.egg
unzip pyliblzma-$(VER)-py2.7-linux-$(shell uname -m).egg
rm -rf /usr/lib/python2.7/site-packages/pyliblzma-$(VER)-py2.7-linux-$(shell uname -m).egg
rm -rf /usr/lib/python2.7/site-packages/EGG-INFO
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/sdl
View File

@@ -77,6 +77,10 @@ dist:
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(MACHINE)" "arm"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SDL-1.2.11-asm-page.h.patch
cd $(DIR_APP) && sed "/asm\/page.h/d" -i src/video/fbcon/SDL_fbvideo.c
endif
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

3
lfs/splix
View File

@@ -77,6 +77,9 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(MACHINE)" "arm"
cd $(DIR_APP) && sed -e "s/ceill/ceil/g" -i src/*.cpp
endif
cd $(DIR_APP) && make DISABLE_JBIG=1 $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

2
lfs/sysstat
View File

@@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysstat-6.0.2-sysconf.patch
cd $(DIR_APP) && sed "/asm\/page.h/d" -i common.c
cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/sysstat/CONFIG build/
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install