Changeset: 24560de52193 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24560de52193
Modified Files:
MonetDB.spec
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (79 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,7 +1,6 @@
%define name MonetDB
%define version 11.2.0
%{!?buildno: %define buildno %(date +%Y%m%d)}
-%define release %{buildno}%{?dist}%{?oid32:.oid32}%{!?oid32:.oid%{bits}}
# groups of related archs
%define all_x86 i386 i586 i686
@@ -12,6 +11,13 @@
%define bits 64
%endif
+# only add .oidXX suffix if oid size differs from bit size
+%if %{bits} == 64 && %{?oid32:1}%{!?oid32:0}
+%define oidsuf .oid32
+%endif
+
+%define release %{buildno}%{?dist}%{?oidsuf:.oidsuf}
+
Name: %{name}
Version: %{version}
Release: %{release}
diff --git a/buildtools/burg/ChangeLog b/buildtools/burg/ChangeLog
new file mode 100644
--- /dev/null
+++ b/buildtools/burg/ChangeLog
@@ -0,0 +1,27 @@
+This is a modified version of Burg.
+
+The following modifications have been made to ease the
+development of the Pathfinder XQuery compiler project:
+
+ -- Added printing of `#line' tags in the generated C code.
+ (Eases development process with some development tools.)
+
+ -- Made documentation LaTeX2e compliant.
+
+ -- Integrated Burg into the Pathfinder build setup. The
+ Makefile is now created via autogen/automake/autoconf.
+ The original Makefile is available in the file
+ `Makefile.orig'.
+
+ -- Made Grammar file gram.y bison-compliant: Removed `='
+ characters.
+
+ -- Several minor changes to make Burg compile on modern
+ (and restrictive) compilers. (Added function declarations,
+ #includes, etc.)
+
+The original source code of Burg is available via the site
+http://research.microsoft.com/~toddpro/. Please do not
+report bugs related to this modified version to the original
+burg developer, Todd A. Proebsting, but to the Pathfinder
+development team at pathfin...@inf.uni-konstanz.de.
diff --git a/rpm.mk.in b/rpm.mk.in
--- a/rpm.mk.in
+++ b/rpm.mk.in
@@ -21,7 +21,7 @@
rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpmbuild
-RPMBUILDARGS = --define="_tmppath /tmp" --define="_topdir $(rpmtopdir)"
--define="tmpdir %{_tmppath}" --define="rpmcflags -O2 " --define="dist
_@LINUX_DIST@" --define="packager MonetDB Database System <i...@monetdb.org>"
--define="oid@oids@ 1"
+RPMBUILDARGS = --define="_tmppath /tmp" --define="_topdir $(rpmtopdir)"
--define="tmpdir %{_tmppath}" --define="rpmcflags -O2 " --define="packager
MonetDB Database System <i...@monetdb.org>" --define="oid@oids@ 1"
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -34,7 +34,7 @@
mkdir -p $(rpmtopdir)/INSTALL
rpm: MonetDB.spec $(top_builddir)/$(distdir).tar.gz $(rpmtopdir)/rpmmacros
- $(RPMBUILD) $(RPMBUILDARGS) -ta --target `uname -m` --define="comp_cc
@CC@" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) $(RPMBUILDARGS) --define="dist _@LINUX_DIST@" -ta --target
`uname -m` --define="comp_cc @CC@" $(top_builddir)/$(distdir).tar.gz
srpm: MonetDB.spec $(top_builddir)/$(distdir).tar.gz $(rpmtopdir)/rpmmacros
- $(RPMBUILD) $(RPMBUILDARGS) -ts $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) $(RPMBUILDARGS) --define="dist %{?undefined}" -ts
$(top_builddir)/$(distdir).tar.gz
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
