rel2: pkg-config + vpi-header prototype patch

4 files changed, 54 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2d654b840458..67948d6031ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = oss-cvc-git
 	pkgdesc = a full IEEE 1364 2005 compliant Verilog Hardware Description Language (HDL) simulator
 	pkgver = r11.d01c4ab
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/cambridgehackers/open-src-cvc
 	arch = x86_64
 	license = custom
@@ -11,9 +11,13 @@ pkgbase = oss-cvc-git
 	source = oss-cvc::git+https://github.com/cambridgehackers/open-src-cvc.git
 	source = header-fix.patch
 	source = mem-mgmt-fix.patch
+	source = vpi-header-fix.patch
+	source = oss-cvc-vpi.pc
 	md5sums = SKIP
 	md5sums = 87e282ade0fc00012cc2061f464276ad
 	md5sums = 288f25791fe0148f7c9fa8b009300add
+	md5sums = e067b67f9453cf61629cc9d8f8d58b2b
+	md5sums = e0b29b4e45f3e16e2da33fb95e02317d
 
 pkgname = oss-cvc-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 990922f89429..a4f84d20f07e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=oss-cvc-git
 pkgver=r11.d01c4ab
-pkgrel=1
+pkgrel=2
 pkgdesc="a full IEEE 1364 2005 compliant Verilog Hardware Description Language (HDL) simulator"
 arch=("x86_64")
 # original provider: http://www.tachyon-da.com/
@@ -17,35 +17,40 @@ options=()
 install=
 source=('oss-cvc::git+https://github.com/cambridgehackers/open-src-cvc.git'
         'header-fix.patch'
-        'mem-mgmt-fix.patch')
+        'mem-mgmt-fix.patch'
+        'vpi-header-fix.patch'
+        'oss-cvc-vpi.pc')
 noextract=()
 md5sums=('SKIP'
          '87e282ade0fc00012cc2061f464276ad'
-         '288f25791fe0148f7c9fa8b009300add')
+         '288f25791fe0148f7c9fa8b009300add'
+         'e067b67f9453cf61629cc9d8f8d58b2b'
+         'e0b29b4e45f3e16e2da33fb95e02317d')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+    cd "${srcdir}/${pkgname%-git}"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-	cd "$srcdir/${pkgname%-git}"
-	patch -p1 -i "$srcdir/header-fix.patch"
-	patch -p1 -i "$srcdir/mem-mgmt-fix.patch"
+    cd "${srcdir}/${pkgname%-git}"
+    patch -p1 -i "${srcdir}/header-fix.patch"
+    patch -p1 -i "${srcdir}/mem-mgmt-fix.patch"
+    patch -p1 -i "${srcdir}/vpi-header-fix.patch"
 }
 
 build() {
-	cd "$srcdir/${pkgname%-git}/src"
+    cd "${srcdir}/${pkgname%-git}/src"
     make -f makefile.cvc64 cvc64
 
-	cd "$srcdir/${pkgname%-git}/toggle_coverage/src"
+    cd "${srcdir}/${pkgname%-git}/toggle_coverage/src"
     make -f makefile.lnx all
 }
 
 package() {
-	cd "$srcdir/${pkgname%-git}"
+    cd "${srcdir}/${pkgname%-git}"
 
-	install -d "${pkgdir}/usr/bin"
+    install -d "${pkgdir}/usr/bin"
     for b in \
         src/cvc64 \
         toggle_coverage/src/{chk_tgldat,tgldat_merge,tgldat_report,tvcd_to_tgldat}
@@ -54,12 +59,12 @@ package() {
     done
     ln -s cvc64 "${pkgdir}/usr/bin/cvc"
 
-	install -d "${pkgdir}/usr/include/oss-cvc"
+    install -d "${pkgdir}/usr/include/oss-cvc"
     for h in pli_incs/*.h ; do
         install -m 644 -t "${pkgdir}/usr/include/oss-cvc" $h
     done
 
-	install -d "${pkgdir}/usr/share/licenses/oss-cvc"
+    install -d "${pkgdir}/usr/share/licenses/oss-cvc"
     for l in \
         OSS-CVC-MODIFIED-ARTISTIC-LIC.TXT \
         OSS-CVC-ARTISTIC-LICENSING-FAQ.pdf
@@ -67,7 +72,7 @@ package() {
         install -m 644 -t "${pkgdir}/usr/share/licenses/oss-cvc" $l
     done
 
-	install -d "${pkgdir}/usr/share/doc/oss-cvc"
+    install -d "${pkgdir}/usr/share/doc/oss-cvc"
     for d in \
         *README \
         doc/*{README,txt,pdf} \
@@ -76,4 +81,7 @@ package() {
         do
         install -m 644 -t "${pkgdir}/usr/share/doc/oss-cvc" $d
     done
+
+    install -d "${pkgdir}/usr/lib/pkgconfig"
+    install -m 644 -t "${pkgdir}/usr/lib/pkgconfig" "${srcdir}/oss-cvc-vpi.pc"
 }
diff --git a/oss-cvc-vpi.pc b/oss-cvc-vpi.pc
new file mode 100644
index 000000000000..a64b19231b62
--- /dev/null
+++ b/oss-cvc-vpi.pc
@@ -0,0 +1,13 @@
+# package-config
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: OSS-CVC vpi
+Description: vpi library for simulation with oss-cvc
+Version: 7.0
+# URL:
+# Libs:
+# Libs.private:
+Cflags: -I${includedir}/oss-cvc
diff --git a/vpi-header-fix.patch b/vpi-header-fix.patch
new file mode 100644
index 000000000000..32bf9b8914dd
--- /dev/null
+++ b/vpi-header-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/pli_incs/vpi_user.h b/pli_incs/vpi_user.h
+index cc63816..8c6911c 100644
+--- a/pli_incs/vpi_user.h
++++ b/pli_incs/vpi_user.h
+@@ -755,7 +755,7 @@ XXTERN vpiHandle   vpi_handle_by_multi_index PROTO_PARAMS((vpiHandle obj,
+                                                      PLI_INT32 num_index,
+                                                      PLI_INT32 *index_array));
+ /****************************** GLOBAL VARIABLES ******************************/
+-PLI_VEXTERN PLI_DLLESPEC void (*vlog_startup_routines[])();
++PLI_VEXTERN PLI_DLLESPEC void (*vlog_startup_routines[])(void);
+   /* array of function pointers, last pointer should be null */
+ #undef PLI_EXTERN
+ #undef PLI_VEXTERN