Skip to content

Commit

Permalink
[Misc] Update mailing list and remove jemalloc dependency from make.sh
Browse files Browse the repository at this point in the history
Test Plan: sanity test

Reviewers: 麦庶, 在弦

Reviewed By: 麦庶, 在弦

Subscribers: 三红

Differential Revision: https://aone.alibaba-inc.com/code/D857546
  • Loading branch information
Chuansheng Lu committed Mar 20, 2019
1 parent 918d5eb commit 2f88d15
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ else
BUILD_INDEX=b$BUILD_NUMBER
fi

export LDFLAGS_JDK="-L/vmfarm/tools/jemalloc/lib -ljemalloc"
bash ./configure --with-milestone=fcs \
--with-freetype=/vmfarm/tools/freetype/ \
--with-update-version=$JDK_UPDATE_VERSION \
Expand All @@ -61,16 +60,13 @@ bash ./configure --with-milestone=fcs \
--with-debug-level=$DEBUG_LEVEL \
--with-extra-cflags="-DVENDOR='\"Alibaba\"' \
-DVENDOR_URL='\"http://www.alibabagroup.com\"' \
-DVENDOR_URL_BUG='\"mailto:jvm@list.alibaba-inc.com\"'" \
-DVENDOR_URL_BUG='\"mailto:dragonwell_use@googlegroups.com\"'" \
--with-zlib=system \
--with-extra-ldflags="-Wl,--build-id=sha1"
make clean
make LOG=debug DISTRO_NAME=$DISTRO_NAME DISTRO_VERSION=$DISTRO_VERSION COMPANY_NAME=Alibaba images

\cp -f /vmfarm/tools/hsdis/8/amd64/hsdis-amd64.so $NEW_JAVA_HOME/jre/lib/amd64/
\cp -f /vmfarm/tools/jemalloc/lib/libjemalloc.so.2 $NEW_JAVA_HOME/jre/lib/amd64/
\cp -f /vmfarm/tools/jemalloc/lib/libjemalloc.so.2 $NEW_JAVA_HOME/lib/amd64/
\cp -f /vmfarm/tools/jemalloc/lib/libjemalloc.so.2 $NEW_JRE_HOME/lib/amd64/

# Sanity tests
JAVA_EXES=("$NEW_JAVA_HOME/bin/java" "$NEW_JAVA_HOME/jre/bin/java" "$NEW_JRE_HOME/bin/java")
Expand Down Expand Up @@ -102,7 +98,7 @@ $NEW_JAVA_HOME/bin/java -cp /tmp/ systemProperty > /tmp/systemProperty.out
EXPECTED_PATTERN=('^java\.vm\.vendor\=.*Alibaba.*$'
'^java\.vendor\.url\=http\:\/\/www\.alibabagroup\.com$'
'^java\.vendor\=Alibaba$'
'^java\.vendor\.url\.bug\=mailto\:jvm@list\.alibaba-inc\.com$')
'^java\.vendor\.url\.bug\=mailto\:dragonwell_use@googlegroups\.com$')
RET=0
for p in ${EXPECTED_PATTERN[*]}
do
Expand Down

0 comments on commit 2f88d15

Please sign in to comment.