Skip to content

modify build xml file and ArchName.java #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

modify build xml file and ArchName.java #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96b30f8
build and load 32 bit program and library on hpux ia64 platform
dulong Aug 21, 2015
9bf3909
modify compiler name and linker name and add arguments
dulong Aug 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions bindings/java/hyperic_jni/jni-build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,9 @@
relentless="false">

<!-- HPUX -->
<compiler name="hp" if="hpux">
<compiler name="aCC" if="hpux">
<compilerarg value="+Z"/>
<compilerarg value="-Ae"/>
<compilerarg value="+DD64" if="jni.arch64"/>

<defineset>
Expand All @@ -281,7 +282,8 @@
</defineset>
</compiler>

<linker name="hp" if="hpux">
<linker name="aCC" if="hpux">
<linkerarg value="+DD64" if="jni.arch64"/>
<libset if="jni.libset.libs"
dir="${jni.libset.dir}"
libs="${jni.libset.libs}"/>
Expand Down Expand Up @@ -437,7 +439,7 @@
</linker>

<!-- AIX -->
<compiler name="xlc_r" if="aix">
<compiler name="xlC" if="aix">
<compilerarg value="-q64" if="jni.arch64"/>
<defineset>
<define name="${jni.define.name}_AIX"/>
Expand All @@ -447,7 +449,7 @@
</defineset>
</compiler>

<linker name="xlc_r" if="aix">
<linker name="xlC" if="aix">
<linkerarg value="-b64" if="jni.arch64"/>
<libset if="jni.libset.libs"
dir="${jni.libset.dir}"
Expand Down
5 changes: 4 additions & 1 deletion bindings/java/hyperic_jni/src/org/hyperic/jni/ArchName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ else if (name.equals("SunOS")) {
}
else if (name.equals("HP-UX")) {
if (arch.startsWith("IA64")) {
arch = "ia64";
arch = "ia";
if (is64()) {
arch += "64";
}
}
else {
arch = "pa";
Expand Down