diff options
| author | Arjan Bouter | 2010-06-30 03:20:11 +0200 |
|---|---|---|
| committer | Arjan Bouter | 2010-06-30 03:20:11 +0200 |
| commit | f21ff248dc1e82a85643ef3ffef1208c7b2bee71 (patch) | |
| tree | 44b0f6c53c21d045be33a71f0cac50c3aaf267cb | |
| parent | 82cd87b23df24ce4856292ea6f09ae9a38142ce8 (diff) | |
luaexpat: added -fPIC fix for x86_64 and some gentoo fixes
| -rw-r--r-- | lua-forge/luaexpat/HISTORY | 3 | ||||
| -rwxr-xr-x | lua-forge/luaexpat/PRE_BUILD | 11 | ||||
| -rw-r--r-- | lua-forge/luaexpat/makefile.patch | 20 |
3 files changed, 33 insertions, 1 deletions
diff --git a/lua-forge/luaexpat/HISTORY b/lua-forge/luaexpat/HISTORY index 4650b7da0a..2b96b99c31 100644 --- a/lua-forge/luaexpat/HISTORY +++ b/lua-forge/luaexpat/HISTORY @@ -1,3 +1,6 @@ +2010-06-30 Arjan Bouter <abouter@sourcemage.org> + * PRE_BUILD: added sedit fPIC fix and some gentoo fixes + 2008-01-11 Vlad Glagolev <stealth@sourcemage.org> * PRE_BUILD: replace >=1 dir (/usr/local => /usr) diff --git a/lua-forge/luaexpat/PRE_BUILD b/lua-forge/luaexpat/PRE_BUILD index 1f17d4362b..f5eb2d3c9b 100755 --- a/lua-forge/luaexpat/PRE_BUILD +++ b/lua-forge/luaexpat/PRE_BUILD @@ -1,4 +1,13 @@ default_pre_build && cd $SOURCE_DIRECTORY && -sed -i "s:5.0:5.1:g;s:500:501:g;s:/usr/local:$INSTALL_ROOT/usr:g" config +sedit "s:5.0:5.1:g;s:500:501:g;s:/usr/local:$INSTALL_ROOT/usr:g" config && +sedit "s#^LUA_LIBDIR=.*#LUA_LIBDIR=$(pkg-config --variable INSTALL_CMOD lua)#" config && +sedit "s#^LUA_DIR=.*#LUA_DIR=$(pkg-config --variable INSTALL_LMOD lua)#" config && +sedit "s#^LUA_INC=.*#LUA_INC=$(pkg-config --variable INSTALL_INC lua)#" config && +sedit "s#^EXPAT_INC=.*#EXPAT_INC=/usr/include#" config && +sedit "s#^LUA_VERSION_NUM=.*#LUA_VERSION_NUM=501#" config && +if [[ "${SMGL_COMPAT_ARCHS[1]}" = "x86_64" ]]; then + sedit "s/-ansi/-fPIC -ansi/" config +fi && +patch -p0 < "${SCRIPT_DIRECTORY}/makefile.patch" diff --git a/lua-forge/luaexpat/makefile.patch b/lua-forge/luaexpat/makefile.patch new file mode 100644 index 0000000000..128d30480f --- /dev/null +++ b/lua-forge/luaexpat/makefile.patch @@ -0,0 +1,20 @@ +--- makefile.old 2006-06-08 20:41:48.000000000 +0000 ++++ makefile 2009-10-26 14:19:08.000000000 +0000 +@@ -18,11 +18,11 @@ + $(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c + + install: +- mkdir -p $(LUA_LIBDIR) +- cp src/$(LIBNAME) $(LUA_LIBDIR) +- cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so +- mkdir -p $(LUA_DIR)/$T +- cp src/$T/lom.lua $(LUA_DIR)/$T ++ mkdir -p $(DESTDIR)$(LUA_LIBDIR) ++ cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR) ++ cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so ++ mkdir -p $(DESTDIR)$(LUA_DIR)/$T ++ cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T + + clean: + rm -f src/$(LIBNAME) $(OBJS) + |