Temporary changes for src

This commit is contained in:
seefo
2018-01-16 01:02:26 -05:00
parent d760a794dd
commit 4241bb9991
3 changed files with 15 additions and 4 deletions

View File

@@ -13,11 +13,14 @@ run alien -i /redist/oracle-instantclient12.1-basic-12.1.0.2.0-1.i386.rpm
run alien -i /redist/oracle-instantclient12.1-devel-12.1.0.2.0-1.i386.rpm
run alien -i /redist/oracle-instantclient12.1-sqlplus-12.1.0.2.0-1.i386.rpm
run apt-get install -y wget
# install java
run cd /redist/ && \
tar -xvzf IBMJava2-SDK-1.4.2-13.18.tgz && \
mv IBMJava2-142/ /opt && \
ln -s /opt/IBMJava2-142 /usr/java
wget --no-check-certificate https://bitbucket.org/swgnoobs/dontask/downloads/jdk-8u73-linux-i586.tar.gz && \
tar -xvzf jdk-8u73-linux-i586.tar.gz && \
sudo mv jdk1.8.0_73/ /opt && \
sudo ln -s /opt/jdk1.8.0_73 /usr/java
# build and install curl
add src/external/3rd/library/curl/curl-7.45.0 /redist/curl/
@@ -25,6 +28,7 @@ run cd /redist/curl && ./configure && make && make install
# env variables
ENV JAVA_HOME /usr/java
ENV JAVA_PATH /usr/java
ENV ORACLE_HOME /usr/lib/oracle/12.1/client
run export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/oracle/12.1/client/lib:/usr/include/oracle/12.1/client
run ldconfig

View File

@@ -1,4 +1,11 @@
rm -rf build/*
export _JAVA_HOME=/usr/java
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/java/jre/lib/i386:/usr/java/jre/lib/i386/xawt
export PATH=$PATH:/usr/java/bin
ls /usr/java/jre/lib/i386/
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release
make -j$(nproc)

View File

@@ -97,7 +97,7 @@ set(JAVA_AWT_LIBRARY_DIRECTORIES
file(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME)
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
${_JAVA_HOME}/jre/lib/{libarch}
/usr/java/jre/lib/i386
${_JAVA_HOME}/jre/lib
${_JAVA_HOME}/jre/bin
${_JAVA_HOME}/jre/bin/classic