pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/databases/db4



Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Jun 18 12:49:22 UTC 2024

Modified Files:
        pkgsrc/databases/db4: distinfo
        pkgsrc/databases/db4/patches: patch-ab

Log Message:
db4: Port the configure script to C99.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/databases/db4/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/db4/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/db4/distinfo
diff -u pkgsrc/databases/db4/distinfo:1.49 pkgsrc/databases/db4/distinfo:1.50
--- pkgsrc/databases/db4/distinfo:1.49  Tue Oct 26 10:09:16 2021
+++ pkgsrc/databases/db4/distinfo       Tue Jun 18 12:49:22 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.49 2021/10/26 10:09:16 nia Exp $
+$NetBSD: distinfo,v 1.50 2024/06/18 12:49:22 markd Exp $
 
 BLAKE2s (db-4.8.30.tar.gz) = 0f2f1b2e53dbabd4c34a4df9dbf91f9051a24375bbbfb75c56372bb3af1ca979
 SHA512 (db-4.8.30.tar.gz) = d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
 Size (db-4.8.30.tar.gz) = 22887305 bytes
 SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a
-SHA1 (patch-ab) = 397dcb7e7bd0cb0f266cd460b9d76c8339118bc5
+SHA1 (patch-ab) = 542ea62e3326a4d52fcf6c7afdbf7132d5880c00
 SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf
 SHA1 (patch-ae) = e47582c71470386a5226408e4d1db31adccadc29
 SHA1 (patch-af) = d9706895e538468f3b442fde3e8d6c9caceaaf4f

Index: pkgsrc/databases/db4/patches/patch-ab
diff -u pkgsrc/databases/db4/patches/patch-ab:1.26 pkgsrc/databases/db4/patches/patch-ab:1.27
--- pkgsrc/databases/db4/patches/patch-ab:1.26  Thu Feb 14 14:36:06 2019
+++ pkgsrc/databases/db4/patches/patch-ab       Tue Jun 18 12:49:22 2024
@@ -1,4 +1,9 @@
-$NetBSD: patch-ab,v 1.26 2019/02/14 14:36:06 thorpej Exp $
+$NetBSD: patch-ab,v 1.27 2024/06/18 12:49:22 markd Exp $
+
+Port the configure script to C99.  Add missing header files, avoid
+calling the undeclared exit function, and add missing return types
+main.  This improves compatibility with compilers which do not accept
+language features that were removed from C99.
 
 --- dist/configure.orig        2010-04-12 20:25:23.000000000 +0000
 +++ dist/configure
@@ -173,7 +178,188 @@ $NetBSD: patch-ab,v 1.26 2019/02/14 14:3
        hp*)            _JNI_INC_SUBDIRS="hp-ux";;
        linux*)         _JNI_INC_SUBDIRS="linux genunix";;
        osf*)           _JNI_INC_SUBDIRS="alpha";;
-@@ -19567,6 +19609,31 @@ fi
+@@ -18755,6 +18797,7 @@ if test "$cross_compiling" = yes; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+ int
+ main ()
+@@ -18791,8 +18834,9 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+       pthread_cond_t cond;
+       pthread_mutex_t mutex;
+       pthread_condattr_t condattr;
+@@ -18827,6 +18871,7 @@ if test "$cross_compiling" = yes; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+ int
+ main ()
+@@ -18863,8 +18908,9 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+       pthread_cond_t cond;
+       pthread_mutex_t mutex;
+       pthread_condattr_t condattr;
+@@ -18898,6 +18944,7 @@ if test "$cross_compiling" = yes; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+ int
+ main ()
+@@ -18932,8 +18979,9 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+       pthread_cond_t cond;
+       pthread_mutex_t mutex;
+       pthread_condattr_t condattr;
+@@ -18966,6 +19014,7 @@ if test "$cross_compiling" = yes; then :
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+ int
+ main ()
+@@ -19000,8 +19049,9 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+ #include <pthread.h>
+-main() {
++int main() {
+       pthread_cond_t cond;
+       pthread_mutex_t mutex;
+       pthread_condattr_t condattr;
+@@ -19037,6 +19087,7 @@ fi
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+       #include <synch.h>
+ int
+ main ()
+@@ -19067,6 +19118,7 @@ rm -f core conftest.err conftest.$ac_obj
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+       #include <thread.h>
+       #include <synch.h>
+ int
+@@ -19097,6 +19149,7 @@ rm -f core conftest.err conftest.$ac_obj
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdlib.h>
+       #include <thread.h>
+       #include <synch.h>
+ int
+@@ -19141,7 +19194,7 @@ main ()
+ {
+ 
+       #if (defined(i386) || defined(__i386__)) && defined(__GNUC__)
+-              exit(0);
++              return 0;
+       #else
+               FAIL TO COMPILE/LINK
+       #endif
+@@ -19164,7 +19217,7 @@ main ()
+ {
+ 
+       #if (defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__)
+-              exit(0);
++              return 0;
+       #else
+               FAIL TO COMPILE/LINK
+       #endif
+@@ -19216,7 +19269,7 @@ main ()
+ 
+       #if defined(__sparc__) && defined(__GNUC__)
+               asm volatile ("membar #StoreStore|#StoreLoad|#LoadStore");
+-              exit(0);
++              return 0;
+       #else
+               FAIL TO COMPILE/LINK
+       #endif
+@@ -19287,7 +19340,7 @@ main ()
+       msem_init(&x, 0);
+       msem_lock(&x, 0);
+       msem_unlock(&x, 0);
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19319,7 +19372,7 @@ main ()
+       msem_init(&x, 0);
+       msem_lock(&x, 0);
+       msem_unlock(&x, 0);
+-      exit(0);
++      return 0;
+ 
+   ;
+   return 0;
+@@ -19371,7 +19424,7 @@ main ()
+ {
+ 
+ #if defined(__USLC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19502,7 +19555,7 @@ main ()
+ {
+ 
+ #if defined(__alpha) && defined(__DECC)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19527,7 +19580,7 @@ main ()
+ {
+ 
+ #if defined(__alpha) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19552,7 +19605,7 @@ main ()
+ {
+ 
+ #if defined(__arm__) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19567,6 +19620,31 @@ fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -187,7 +373,7 @@ $NetBSD: patch-ab,v 1.26 2019/02/14 14:3
 +{
 +
 +#if defined(__aarch64__) && defined(__GNUC__)
-+      exit(0);
++      return 0;
 +#else
 +      FAIL TO COMPILE/LINK
 +#endif
@@ -205,7 +391,79 @@ $NetBSD: patch-ab,v 1.26 2019/02/14 14:3
  # MIPS/gcc: Linux
  if test "$db_cv_mutex" = no; then
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -19862,6 +19929,10 @@ ARM/gcc-assembly)     ADDITIONAL_OBJS="mut_t
+@@ -19577,7 +19655,7 @@ main ()
+ {
+ 
+ #if (defined(__mips) || defined(__mips__)) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19602,7 +19680,7 @@ main ()
+ {
+ 
+ #if (defined(__hppa) || defined(__hppa__)) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19627,7 +19705,7 @@ main ()
+ {
+ 
+ #if (defined(__powerpc__) || defined(__ppc__)) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19652,7 +19730,7 @@ main ()
+ {
+ 
+ #if (defined(mc68020) || defined(sun3)) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19677,7 +19755,7 @@ main ()
+ {
+ 
+ #if defined(__MVS__) && defined(__IBMC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19702,7 +19780,7 @@ main ()
+ {
+ 
+ #if defined(__s390__) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19727,7 +19805,7 @@ main ()
+ {
+ 
+ #if defined(__ia64) && defined(__GNUC__)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19752,7 +19830,7 @@ main ()
+ {
+ 
+ #if defined(_UTS)
+-      exit(0);
++      return 0;
+ #else
+       FAIL TO COMPILE/LINK
+ #endif
+@@ -19862,6 +19940,10 @@ ARM/gcc-assembly)     ADDITIONAL_OBJS="mut_t
                        $as_echo "#define HAVE_MUTEX_ARM_GCC_ASSEMBLY 1" >>confdefs.h
  
                        ;;
@@ -216,3 +474,53 @@ $NetBSD: patch-ab,v 1.26 2019/02/14 14:3
  HP/msem_init)         ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
                        $as_echo "#define HAVE_MUTEX_HPPA_MSEM_INIT 1" >>confdefs.h
  
+@@ -20203,9 +20285,9 @@ main ()
+ {
+ 
+       #if ((defined(i386) || defined(__i386__)) && defined(__GNUC__))
+-              exit(0);
++              return 0;
+       #elif ((defined(x86_64) || defined(__x86_64__)) && defined(__GNUC__))
+-              exit(0);
++              return 0;
+       #else
+               FAIL TO COMPILE/LINK
+       #endif
+@@ -20720,6 +20802,7 @@ if test "$cross_compiling" = yes; then :
+ /* end confdefs.h.  */
+ 
+ #include <sys/time.h>
++#include <time.h>
+ int
+ main ()
+ {
+@@ -20743,7 +20826,8 @@ else
+ /* end confdefs.h.  */
+ 
+ #include <sys/time.h>
+-main() {
++#include <time.h>
++int main() {
+       struct timespec t;
+       return (clock_gettime(CLOCK_MONOTONIC, &t) != 0);
+ }
+@@ -21600,6 +21684,8 @@ $as_echo_n "checking for 64-bit integral
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <stdio.h>
++#include <string.h>
+ int
+ main ()
+ {
+@@ -21634,7 +21720,9 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-              main() {
++              #include <stdio.h>
++              #include <string.h>
++              int main() {
+                       $db_cv_seq_type l;
+                       unsigned $db_cv_seq_type u;
+                       char buf[100];



Home | Main Index | Thread Index | Old Index