Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17691
Modified Files:
MonetDB-XQuery.spec.in rpm.mk.in
Log Message:
Made spec file and source RPM less system dependent.
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- MonetDB-XQuery.spec.in 24 Jul 2007 14:40:24 -0000 1.26
+++ MonetDB-XQuery.spec.in 25 Jul 2007 13:43:42 -0000 1.27
@@ -31,8 +31,6 @@
%endif
BuildRequires: libxml2-devel
-%define comp_cc @CC@
-
# groups of related archs
%define all_x86 i386 i586 i686
@@ -75,7 +73,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
- CC="%{comp_cc}" \
+ %{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--libdir=%{_libdir} \
--with-monet=%{prefix}
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/rpm.mk.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- rpm.mk.in 18 Jul 2007 10:51:58 -0000 1.12
+++ rpm.mk.in 25 Jul 2007 13:43:42 -0000 1.13
@@ -43,7 +43,7 @@
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
rpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) -ta --define="buildsystem 1" --target `uname -m` --rcfile
$(rpmtopdir)/rpmrc $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) -ta --define="buildsystem 1" --define="comp_cc @CC@"
--target `uname -m` --rcfile $(rpmtopdir)/rpmrc
$(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
