Mercurial > hg > icedtea6
changeset 238:d0100142281b
2007-10-04 Lillian Angel <langel@redhat.com>
* INSTALL: Updated docs on how-to-build, and build requirements.
* Makefile.am: Added new patch to list.
* Makefile.in: Regenerate.
* configure: Regenerate.
* configure.ac: Added check for libXinerama libs.
* patches/icedtea-xinerama.patch: New patch for bug #72.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 04 Oct 2007 14:06:11 -0400 |
parents | 3ff54046cde2 |
children | 0d5ebdf62450 |
files | ChangeLog INSTALL Makefile.am Makefile.in configure configure.ac patches/icedtea-xinerama.patch |
diffstat | 7 files changed, 110 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Oct 03 16:48:03 2007 -0700 +++ b/ChangeLog Thu Oct 04 14:06:11 2007 -0400 @@ -1,3 +1,12 @@ +2007-10-04 Lillian Angel <langel@redhat.com> + + * INSTALL: Updated docs on how-to-build, and build requirements. + * Makefile.am: Added new patch to list. + * Makefile.in: Regenerate. + * configure: Regenerate. + * configure.ac: Added check for libXinerama libs. + * patches/icedtea-xinerama.patch: New patch for bug #72. + 2007-10-03 Keith Seitz <keiths@redhat.com> * patches/icedtea-float-double-trailing-zeros.patch:
--- a/INSTALL Wed Oct 03 16:48:03 2007 -0700 +++ b/INSTALL Thu Oct 04 14:06:11 2007 -0400 @@ -5,13 +5,6 @@ download, extract and patch the source code from openjdk.java.net, in a default location. -To build IcedTea, do: - -./configure [OPTION]... [VAR=VALUE]... -make - -There is currently no install target. - The build requirements are as follows: GNU libgcj 4.1.2 @@ -31,22 +24,23 @@ firefox-devel glib2-devel gtk2-devel +ant >= 1.6.5 +libXinerama-devel See ./configure --help if you need to override defaults. +./configure + --with-icedtea-home=/path/to/old/icedtea + [default /usr/lib/jvm/java-icedtea] +make + +There is currently no install target. + IcedTea ends up in openjdk/control/build/linux-i586 or openjdk/control/build/linux-amd64 when the build completes. -Building IcedTea with IcedTea ------------------------------ - -To perform a full bootstrap, do: +This builds IcedTea against a previously built IcedTea. -./configure -make - -This builds IcedTea against ecj running on libgcj first then uses the -result of that build to build IcedTea again. Rebuilding The IcedTea Plugs ----------------------------
--- a/Makefile.am Wed Oct 03 16:48:03 2007 -0700 +++ b/Makefile.am Thu Oct 04 14:06:11 2007 -0400 @@ -139,6 +139,7 @@ patches/icedtea-gcc-suffix.patch \ patches/icedtea-bytebuffer-compact.patch \ patches/icedtea-float-double-trailing-zeros.patch \ + patches/icedtea-xinerama.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES)
--- a/Makefile.in Wed Oct 03 16:48:03 2007 -0700 +++ b/Makefile.in Thu Oct 04 14:06:11 2007 -0400 @@ -255,6 +255,7 @@ patches/icedtea-gcc-suffix.patch \ patches/icedtea-bytebuffer-compact.patch \ patches/icedtea-float-double-trailing-zeros.patch \ + patches/icedtea-xinerama.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES)
--- a/configure Wed Oct 03 16:48:03 2007 -0700 +++ b/configure Thu Oct 04 14:06:11 2007 -0400 @@ -6817,6 +6817,81 @@ fi +{ echo "$as_me:$LINENO: checking for XineramaQueryExtension in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaQueryExtension in -lXinerama... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XineramaQueryExtension (); +int +main () +{ +return XineramaQueryExtension (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_Xinerama_XineramaQueryExtension=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_Xinerama_XineramaQueryExtension=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +if test $ac_cv_lib_Xinerama_XineramaQueryExtension = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBXINERAMA 1 +_ACEOF + + LIBS="-lXinerama $LIBS" + +else + { { echo "$as_me:$LINENO: error: \"libXinerama not found - try installing libXinerama-devel\"" >&5 +echo "$as_me: error: \"libXinerama not found - try installing libXinerama-devel\"" >&2;} + { (exit 1); exit 1; }; } +fi + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
--- a/configure.ac Wed Oct 03 16:48:03 2007 -0700 +++ b/configure.ac Thu Oct 04 14:06:11 2007 -0400 @@ -72,6 +72,8 @@ AC_CHECK_LIB(Xtst, XTestQueryExtension, , [AC_MSG_ERROR("libXtst not found - try installing libXtst-devel")]) +AC_CHECK_LIB(Xinerama, XineramaQueryExtension, + , [AC_MSG_ERROR("libXinerama not found - try installing libXinerama-devel")]) dnl Check for plugin support headers and libraries. PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-xinerama.patch Thu Oct 04 14:06:11 2007 -0400 @@ -0,0 +1,12 @@ +diff -up openjdk/j2se/make/sun/xawt/Makefile.jx openjdk/j2se/make/sun/xawt/Makefile +--- openjdk/j2se/make/sun/xawt/Makefile.jx 2007-08-30 03:19:44.000000000 -0400 ++++ openjdk/j2se/make/sun/xawt/Makefile 2007-10-03 14:49:11.000000000 -0400 +@@ -49,8 +49,7 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java + LDFLAGS += -L$(OPENWIN_LIB) + + ifeq ($(PLATFORM), linux) +-FILES_c += Xinerama.c +-LDFLAGS += -lpthread ++LDFLAGS += -lXinerama -lpthread + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif