Attachment #76043 for bug #116567

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

and this patch




done

case "$host_cpu" in
	i?86)		_JNI_LIBDIRS="lib/i386"
			_JNI_LIBSUBDIR="client"
			;;
	x86_64)		_JNI_LIBDIRS="lib/amd64"
			_JNI_LIBSUBDIR="server"
			;;
	powerpc)	_JNI_LIBDIRS="bin lib/ppc"
			_JNI_LIBSUBDIR="classic"
			;;
	*)		_JNI_LIBDIRS=""
esac

for d in $_JNI_LIBDIRS; do
	echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR"
	if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then
		JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/$d"
		JNI_LD_PATH="$_JTOPDIR/jre/$d"
	fi
done





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])

  LDSOFLAGS="$LDSOFLAGS -L$d"
done

JAVALDPATH=$JNI_LD_PATH

if test "$java_abs_paths" = yes; then
  JAVA_CC="$JAVA_BINDIR/$JAVA_CC"
fi

Lines 34-39 Link Here

(-)pl-5.6.0.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.0.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 130-135 Link Here
130	LDSOFLAGS="$LDSOFLAGS -L$d"	133	LDSOFLAGS="$LDSOFLAGS -L$d"
131	done	134	done
132		135
		136	JAVALDPATH=$JNI_LD_PATH
		137
133	if test "$java_abs_paths" = yes; then	138	if test "$java_abs_paths" = yes; then
134	JAVA_CC="$JAVA_BINDIR/$JAVA_CC"	139	JAVA_CC="$JAVA_BINDIR/$JAVA_CC"
135	fi	140	fi

Lines 54-68 Link Here

(-)pl-5.6.0.orig/packages/jpl/ac/ac_jni_include_dirs.m4 (-6 / +14 lines)
54	done	54	done
55		55
56	case "$host_cpu" in	56	case "$host_cpu" in
57	i?86) _JNI_LIBDIRS="i386"	57	i?86) _JNI_LIBDIRS="lib/i386"
58	;;	58	_JNI_LIBSUBDIR="client"
59	*) _JNI_LIBDIRS=""	59	;;
		60	x86_64) _JNI_LIBDIRS="lib/amd64"
		61	_JNI_LIBSUBDIR="server"
		62	;;
		63	powerpc) _JNI_LIBDIRS="bin lib/ppc"
		64	_JNI_LIBSUBDIR="classic"
		65	;;
		66	*) _JNI_LIBDIRS=""
60	esac	67	esac
61		68
62	for d in $_JNI_LIBDIRS; do	69	for d in $_JNI_LIBDIRS; do
63	echo "Trying $_JTOPDIR/jre/lib/$d/client"	70	echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR"
64	if test -d $_JTOPDIR/jre/lib/$d/client; then	71	if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then
65	JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/lib/$d/client $_JTOPDIR/jre/lib/$d"	72	JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/$d"
		73	JNI_LD_PATH="$_JTOPDIR/jre/$d"
66	fi	74	fi
67	done	75	done
68		76