Fehler beim Kompilieren nach aenderungen der qt-flags.
sed ist nicht mehr notwendig. USE_ARCH war nicht definiert. git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5022 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
7666b209d4
commit
96f6ffffa0
@ -86,6 +86,7 @@ mk32() {
|
||||
CC="gcc $BUILDOPTIONS32 -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS32 -fPIC" \
|
||||
LDFLAGS="-L/opt/qt-4/lib" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET32 \
|
||||
--prefix=/usr \
|
||||
$GUIOPTIONS \
|
||||
@ -93,7 +94,6 @@ mk32() {
|
||||
--enable-driver \
|
||||
--with-gnu-ld \
|
||||
--sysconfdir=/etc/sysconfig/unixODBC &&
|
||||
# sed -i -e "s/YY_FLUSH_BUFFER/yy_flush_buffer(YY_CURRENT_BUFFER)/" sqp/lex.l &&
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU install &&
|
||||
make -j $NUMCPU DESTDIR=$TMPROOT install
|
||||
@ -110,6 +110,7 @@ mk() {
|
||||
CC="gcc $BUILDOPTIONS -fPIC" \
|
||||
CXX="g++ $BUILDOPTIONS -fPIC" \
|
||||
LDFLAGS="-L/opt/qt-4/lib64" \
|
||||
USE_ARCH=$UARCH \
|
||||
./configure --target=$TARGET \
|
||||
--prefix=/usr \
|
||||
$ADDOPTIONS \
|
||||
@ -118,11 +119,9 @@ mk() {
|
||||
--enable-driver \
|
||||
--with-gnu-ld \
|
||||
--sysconfdir=/etc/sysconfig/unixODBC &&
|
||||
sed -i -e "s/YY_FLUSH_BUFFER/yy_flush_buffer(YY_CURRENT_BUFFER)/" sqp/lex.l &&
|
||||
if [ "$MK64BIT" == "true" ]; then
|
||||
sed -e "s/\/lib /\/lib64 /g" libtool |
|
||||
sed -e "s/\/lib\"/\/lib64\"/g" >/tmp/libtool
|
||||
mv /tmp/libtool .
|
||||
sed -i -e "s/\/lib /\/lib64 /g" libtool
|
||||
sed -i -e "s/\/lib\"/\/lib64\"/g" libtool
|
||||
fi
|
||||
make -j $NUMCPU &&
|
||||
make -j $NUMCPU install &&
|
||||
|
Loading…
Reference in New Issue
Block a user