[Oracleasm-commits] jlbec commits r318 - in trunk: . vendor/common
vendor/rhel4 vendor/sles9
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Sun Nov 20 04:58:51 CST 2005
Author: jlbec
Date: 2005-11-20 04:58:49 -0600 (Sun, 20 Nov 2005)
New Revision: 318
Modified:
trunk/Config.make.in
trunk/Makefile
trunk/configure.in
trunk/vendor/common/Makefile
trunk/vendor/rhel4/Makefile
trunk/vendor/rhel4/Vendor.make
trunk/vendor/sles9/Makefile
trunk/vendor/sles9/Vendor.make
Log:
o Move all non-RPM_VERSION RPM logic out of configure
o Fix up make dist of new files
Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/Config.make.in 2005-11-20 10:58:49 UTC (rev 318)
@@ -54,8 +54,4 @@
MODULEDIR = @MODULEDIR@
MODVERSIONS = @MODVERSIONS@
-GCCINC = @GCCINC@
-
-RPMBUILD = @RPMBUILD@
-RPM_TOPDIR = @RPM_TOPDIR@
endif
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/Makefile 2005-11-20 10:58:49 UTC (rev 318)
@@ -26,16 +26,20 @@
Config.make.in \
Preamble.make \
Postamble.make \
+ aclocal.m4 \
+ mbvendor.m4 \
config.guess \
config.sub \
configure \
configure.in \
install-sh \
mkinstalldirs \
- rpmarch.guess
+ Vendor.make \
+ vendor.guess
+
include Vendor.make
#
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/configure.in 2005-11-20 10:58:49 UTC (rev 318)
@@ -42,11 +42,6 @@
AC_PATH_PROG(AR, ar)
-AC_CHECK_PROGS(RPMBUILD, rpmbuild rpm)
-AC_MSG_CHECKING([absolute rpm file directory])
-RPM_TOPDIR="`pwd`"
-AC_MSG_RESULT([$RPM_TOPDIR])
-AC_SUBST(RPM_TOPDIR)
AC_HEADER_STDC
AC_C_CONST
@@ -81,58 +76,6 @@
AC_SUBST(M64)
AC_SUBST(USERM64)
-AC_MSG_CHECKING(build architectures)
-TOOLSARCH=
-if test -f /etc/redhat-release
-then
- RPMARCH="`rpm -qf /etc/redhat-release --queryformat \"%{ARCH}\"`"
- if test -n "$RPMARCH" -a "$RPMARCH" != "noarch"
- then
- TOOLSARCH="$RPMARCH"
- fi
-fi
-if test -z "$TOOLSARCH"
-then
- case "$host_cpu" in
- x86_64|ia64|s390x)
- TOOLSARCH="$host_cpu"
- ;;
- i386|i686|i586|i486)
- TOOLSARCH="i386"
- ;;
- ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
- TOOLSARCH="ppc64"
- ;;
- *)
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR([invalid or unsupported CPU type])
- ;;
- esac
-fi
-case "$TOOLSARCH" in
-x86_64|ia64|ppc64)
- MODULEARCH="$TOOLSARCH"
- ;;
-ppc)
- MODULEARCH="$host_cpu"
- ;;
-i386)
- if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release
- then
- MODULEARCH=i586
- else
- MODULEARCH="i686"
- fi
- ;;
-*)
- AC_MSG_RESULT([not found])
- AC_MSG_RESULT([invalid or unsupported kernel CPU type])
- ;;
-esac
-AC_MSG_RESULT([${MODULEARCH}, ${TOOLSARCH}])
-AC_SUBST(MODULEARCH)
-AC_SUBST(TOOLSARCH)
-
MB_VENDOR()
if test "x$GCC" != "xyes"; then
@@ -231,18 +174,7 @@
CPPFLAGS="$saved_CPPFLAGS"
CFLAGS="$saved_CFLAGS"
-AC_MSG_CHECKING(for gcc include path)
-gccdir="`$CC -print-search-dirs | sed -n 's/^install: \(.*\)/\1/p'`include"
-if test -z "$gccdir"; then
- AC_MSG_RESULT(not found)
- AC_MSG_ERROR(Could not determine gcc include path)
-else
- AC_MSG_RESULT($gccdir)
-fi
-GCCINC=$gccdir
-AC_SUBST(GCCINC)
-
AC_MSG_CHECKING(RPM package version)
AC_ARG_WITH(rpmversion, [ --with-rpmversion=version Version for the RPM package [1]], rpmversion="$withval", rpmversion="1")
AC_MSG_RESULT($rpmversion)
Modified: trunk/vendor/common/Makefile
===================================================================
--- trunk/vendor/common/Makefile 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/vendor/common/Makefile 2005-11-20 10:58:49 UTC (rev 318)
@@ -5,6 +5,7 @@
DIST_FILES = \
oracleasm.init \
oracleasm.sysconfig \
- oracleasm-support.spec.in
+ oracleasm-support.spec.in \
+ Vendor.make
include $(TOPDIR)/Postamble.make
Modified: trunk/vendor/rhel4/Makefile
===================================================================
--- trunk/vendor/rhel4/Makefile 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/vendor/rhel4/Makefile 2005-11-20 10:58:49 UTC (rev 318)
@@ -2,6 +2,10 @@
include $(TOPDIR)/Preamble.make
-DIST_FILES = oracleasm-2.6.9-EL.spec-generic.in
+DIST_FILES = \
+ oracleasm-2.6.9-EL.spec-generic.in \
+ rpmarch.guess \
+ Vendor.make \
+ vendor.guess
include $(TOPDIR)/Postamble.make
Modified: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/vendor/rhel4/Vendor.make 2005-11-20 10:58:49 UTC (rev 318)
@@ -12,7 +12,7 @@
sed -e 's/^%define sver.*%{generic}$$/%define sver '$${SPECVER}'/' < $< > $@
rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.EL.spec
- $(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
+ $(RPMBUILD) -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
rhel4_%_rpm: rhel4_%_srpm
$(RPMBUILD) --rebuild $(MODULEARCH) "oracleasm-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
Modified: trunk/vendor/sles9/Makefile
===================================================================
--- trunk/vendor/sles9/Makefile 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/vendor/sles9/Makefile 2005-11-20 10:58:49 UTC (rev 318)
@@ -2,6 +2,10 @@
include $(TOPDIR)/Preamble.make
-DIST_FILES = oracleasm-2.6.5.spec-generic.in
+DIST_FILES = \
+ oracleasm-2.6.5.spec-generic.in \
+ rpmarch.guess \
+ Vendor.make \
+ vendor.guess
include $(TOPDIR)/Postamble.make
Modified: trunk/vendor/sles9/Vendor.make
===================================================================
--- trunk/vendor/sles9/Vendor.make 2005-11-20 10:15:54 UTC (rev 317)
+++ trunk/vendor/sles9/Vendor.make 2005-11-20 10:58:49 UTC (rev 318)
@@ -13,10 +13,10 @@
sed -e 's/^%define sver.*%{generic}$$/%define sver '$${SPECVER}'/' < $< > $@
sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec
- $(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
+ rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
sles9_%_rpm: sles9_%_srpm
- $(RPMBUILD) --rebuild $(MODULEARCH) "oracleasm-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+ rpmbuild --rebuild $(MODULEARCH) "oracleasm-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
include $(TOPDIR)/vendor/common/Vendor.make
More information about the Oracleasm-commits
mailing list