Attachment #79831 for bug #116567

View | Details | Raw Unified | Return to bug 116567 | Differences between

and this patch

Lines 60-65 Link Here

(-)pl-5.6.4.orig/packages/jpl/ac/ac_jni_include_dirs.m4 (+4 lines)
60	x86_64) _JNI_LIBDIRS="amd64"	60	x86_64) _JNI_LIBDIRS="amd64"
61	_JNI_LIBSUBDIR="server"	61	_JNI_LIBSUBDIR="server"
62	;;	62	;;
		63	powerpc) _JNI_LIBDIRS="bin lib/ppc"
		64	_JNI_LIBSUBDIR="classic"
		65	;;
63	*) _JNI_LIBDIRS=""	66	*) _JNI_LIBDIRS=""
64	esac	67	esac
65		68
Lines 67-72 Link Here
67	echo "Trying $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR"	70	echo "Trying $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR"
68	if test -d $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR; then	71	if test -d $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR; then
69	JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/lib/$d"	72	JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/lib/$d"
		73	JNI_LD_PATH="$_JTOPDIR/jre/$d"
70	fi	74	fi
71	done	75	done
72		76




AC_SUBST(LDSOFLAGS)
AC_SUBST(JAVA_HOME)
AC_SUBST(JAVALIBS)
AC_SUBST(JAVALDPATH)

AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
	      [case "$enableval" in

	;;
esac

AC_CANONICAL_HOST			dnl needed to get $host_os

if test "$host_cpu" = powerpc; then
	JAVALIBS=`echo $JAVALIBS | sed 's/-lverify//'`
fi

dnl ================================================================
dnl Java stuff
dnl ================================================================

AC_CANONICAL_HOST			dnl needed to get $host_os

m4_include([ac/ac_prog_javac.m4])
m4_include([ac/ac_prog_javac_works.m4])
m4_include([ac/ac_jni_include_dirs.m4])

  CIFLAGS="$CIFLAGS -I$d"
done

JAVALDPATH=$JNI_LD_PATH

for d in $JNI_CLIENT_DIRS; do
  LDSOFLAGS="$LDSOFLAGS -L$d"
done

Lines 34-39 Link Here

(-)pl-5.6.4.orig/packages/jpl/Makefile.in (-1 / +2 lines)
34	JAVA_HOME=@JAVA_HOME@	34	JAVA_HOME=@JAVA_HOME@
35	JAVAC=@JAVAC@	35	JAVAC=@JAVAC@
36	JAVALIBS=@JAVALIBS@	36	JAVALIBS=@JAVALIBS@
		37	JAVALDPATH=@JAVALDPATH@
37		38
38	DOCTOTEX=$(PCEHOME)/bin/doc2tex	39	DOCTOTEX=$(PCEHOME)/bin/doc2tex
39	PLTOTEX=$(PCEHOME)/bin/pl2tex	40	PLTOTEX=$(PCEHOME)/bin/pl2tex
Lines 68-74 Link Here
68	################################################################	69	################################################################
69		70
70	check:: TestJPL.class	71	check:: TestJPL.class
71	$(PL) -q -f check.pl -g test,halt -t 'halt(1)'	72	LD_LIBRARY_PATH=$(JAVALDPATH) $(PL) -q -f check.pl -g test,halt -t 'halt(1)'
72		73
73	TestJPL.class: TestJPL.java	74	TestJPL.class: TestJPL.java
74	$(JAVAC) -classpath jpl.jar TestJPL.java	75	$(JAVAC) -classpath jpl.jar TestJPL.java

Return to bug 116567

Lines 18-23 Link Here

(-)pl-5.6.4.orig/packages/jpl/configure.in (-2 / +8 lines)
18	AC_SUBST(LDSOFLAGS)	18	AC_SUBST(LDSOFLAGS)
19	AC_SUBST(JAVA_HOME)	19	AC_SUBST(JAVA_HOME)
20	AC_SUBST(JAVALIBS)	20	AC_SUBST(JAVALIBS)
		21	AC_SUBST(JAVALDPATH)
21		22
22	AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading],	23	AC_ARG_ENABLE(mt, [ --enable-mt Enable Multi-threading],
23	[case "$enableval" in	24	[case "$enableval" in
Lines 89-101 Link Here
89	;;	89	;;
90	esac	90	esac
91		91
		92	AC_CANONICAL_HOST dnl needed to get $host_os
		93
		94	if test "$host_cpu" = powerpc; then
		95	JAVALIBS=`echo $JAVALIBS \| sed 's/-lverify//'`
		96	fi
92		97
93	dnl ================================================================	98	dnl ================================================================
94	dnl Java stuff	99	dnl Java stuff
95	dnl ================================================================	100	dnl ================================================================
96		101
97	AC_CANONICAL_HOST dnl needed to get $host_os
98
99	m4_include([ac/ac_prog_javac.m4])	102	m4_include([ac/ac_prog_javac.m4])
100	m4_include([ac/ac_prog_javac_works.m4])	103	m4_include([ac/ac_prog_javac_works.m4])
101	m4_include([ac/ac_jni_include_dirs.m4])	104	m4_include([ac/ac_jni_include_dirs.m4])
Lines 126-131 Link Here
126	CIFLAGS="$CIFLAGS -I$d"	129	CIFLAGS="$CIFLAGS -I$d"
127	done	130	done
128		131
		132	JAVALDPATH=$JNI_LD_PATH
		133
129	for d in $JNI_CLIENT_DIRS; do	134	for d in $JNI_CLIENT_DIRS; do
130	LDSOFLAGS="$LDSOFLAGS -L$d"	135	LDSOFLAGS="$LDSOFLAGS -L$d"
131	done	136	done