Update of /cvsroot/monetdb/java
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28680
Modified Files:
configure.ag rpm.mk.in
Log Message:
Added more rpmrc files to the --rcfile flag of rpmbuild. This is
required for rpmbuild to recognize that in can build for a noarch CPU
architecture.
Removed references to host type from configure. This makes that the
configure which is called by rpmbuild doesn't choke on the noarch CPU
architecture.
Together these two changes make that we can build the rpms.
As a bonus:
Removed AC_DEFINE calls from configure. We don't actually include
monetdb_java_config.h anywhere, so we don't need to add anything extra
to it.
Index: configure.ag
===================================================================
RCS file: /cvsroot/monetdb/java/configure.ag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ag 28 Nov 2007 16:23:57 -0000 1.2
+++ configure.ag 29 Nov 2007 12:01:37 -0000 1.3
@@ -21,18 +21,9 @@
AC_PREREQ(2.59)
AC_INIT([MonetDB Java], [1.7.1], [EMAIL PROTECTED], [java])
AC_CONFIG_AUX_DIR(conf)
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([monetdb_java_config.h])
-HOST=[$target]
-AC_DEFINE_UNQUOTED(HOST, "$HOST", [Host identifier])
-
-if test x"$target_os" = xcygwin; then
- AC_DEFINE(WIN32, 1, [Define on MS Windows (also under Cygwin)])
-fi
-
# MONETDB_JAVA_BUILD and MONETDB_JAVA_SOURCE are *only* used for
monetdb-java-config
# MONETDB_JAVA_SOURCE is the absolute path name of the source directory
# (srcdir can be relative)
@@ -64,8 +55,6 @@
dnl provide different versions of the paths derived above
AM_MONETDB_XQ_VARS_2()
-AC_DEFINE_UNQUOTED(MONETDB_JAVA_PREFIX,"$QXprefix",[architecture-independent
files])
-AC_DEFINE_UNQUOTED(MONETDB_JAVA_EXEC_PREFIX,"$QXexec_prefix",[architecture-dependent
files])
QMONETDB_JAVA_BUILD="$MONETDB_JAVA_BUILD"
XMONETDB_JAVA_BUILD="`$translatepath "$MONETDB_JAVA_BUILD"`"
QXMONETDB_JAVA_BUILD="`echo "$XMONETDB_JAVA_BUILD" | sed 's/\\\\/\\\\\\\\/g'`"
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/java/rpm.mk.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rpm.mk.in 28 Nov 2007 16:23:57 -0000 1.2
+++ rpm.mk.in 29 Nov 2007 12:01:37 -0000 1.3
@@ -38,11 +38,11 @@
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
rpm: MonetDB-java.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --define="buildsystem 1"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile
/usr/lib/rpm/rpmrc:/usr/lib/rpm/redhat/rpmrc:$(rpmtopdir)/rpmrc -ta
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-java.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts --define="buildsystem 1"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile
/usr/lib/rpm/rpmrc:/usr/lib/rpm/redhat/rpmrc:$(rpmtopdir)/rpmrc -ts
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
cleanup_distr:
find java-* -perm -0100 -type f ! -name \*.bat ! -name \*.sh ! -exec
grep -q '^#!' {} \; -exec chmod a-x {} \;
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
