summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Revilla2020-02-11 00:11:00 +0100
committerMiguel Revilla2020-02-11 00:11:00 +0100
commit26241b1ca80332007b1d38c718433ac9a93a820c (patch)
treee2448fb82871812b2522ffb6aed162f775aa5218
parent1521a7257d6d0fdb577ae21d5239a37ccf77b8f0 (diff)
downloadaur-26241b1ca80332007b1d38c718433ac9a93a820c.tar.gz
Update to 2.5.0b17
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD42
2 files changed, 32 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f6e641efc3f..88fa6c2a27bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
pkgbase = odb
pkgdesc = C++ Object-Relational Mapping compiler
- pkgver = 2.4.0
+ pkgver = 2.5.0b17
pkgrel = 1
- url = http://www.codesynthesis.com/products/odb/
arch = i686
arch = x86_64
- license = GPL
- depends = libcutl
+ license = GPL3
+ depends = build2
+ conflicts = libcutl
+ conflicts = libstudxml
options = !libtool
- source = http://www.codesynthesis.com/download/odb/2.4/odb-2.4.0.tar.bz2
- md5sums = 0146d0223f874a9434673682a5669638
pkgname = odb
diff --git a/PKGBUILD b/PKGBUILD
index e809e570a9b6..408883239464 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,42 @@
-# Maintainer: Miguel Revilla <yo@miguelrevilla.com>
-# Contributor: Miguel Revilla <yo@miguelrevilla.com>
+# Maintainer: Miguel Revilla <yo at miguelrevilla dot com>
pkgname=odb
-pkgver=2.4.0
+pkgver=2.5.0b17
pkgrel=1
pkgdesc="C++ Object-Relational Mapping compiler"
arch=('i686' 'x86_64')
-depends=('libcutl')
-url="http://www.codesynthesis.com/products/odb/"
+depends=('build2')
+conflicts=('libcutl' 'libstudxml')
options=('!libtool')
-license=('GPL')
-source=("http://www.codesynthesis.com/download/odb/2.4/odb-${pkgver}.tar.bz2")
-md5sums=('0146d0223f874a9434673682a5669638')
+license=('GPL3')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"
+ mkdir -p "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
- CXXFLAGS="${CXXFLAGS} -fno-devirtualize"
+ GPPVER="$(g++ --version | grep 'g++ (GCC)' | sed 's/g++ (GCC) //')"
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make ECHO=echo
+ bpkg create -d odb-gcc-${GPPVER} cc \
+ config.cxx=g++ \
+ config.cc.coptions=-O3 \
+ config.bin.rpath=${pkgdir}/usr/lib \
+ config.install.root=${pkgdir}/usr
+
+ cd odb-gcc-${GPPVER}
+ yes | bpkg build --trust-yes odb@https://pkg.cppget.org/1/beta
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make ECHO=echo DESTDIR="${pkgdir}" install
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+ GPPVER="$(g++ --version | grep 'g++ (GCC)' | sed 's/g++ (GCC) //')"
+ cd "${srcdir}/${pkgname}-${pkgver}/odb-gcc-${GPPVER}"
+
+ bpkg install odb
+
+ mkdir -p ${pkgdir}/usr/lib/gcc/x86_64-pc-linux-gnu/${GPPVER}/plugin/
+ mv ${pkgdir}/usr/bin/odb.so ${pkgdir}/usr/lib/gcc/x86_64-pc-linux-gnu/${GPPVER}/plugin/
+
+ mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}/
+ mv ${pkgdir}/usr/share/doc/odb/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
}