Browse Source
biology/libneurosim: Fix use of libltdl. dns/ddclient: Take out -Werror. lang/sdcc: - Patching ARCH is no longer needed. Remove it because it touched some configure.ac files and that causes other autotools files to appear out-of-date. - Run autoreconf in WRKSRC/device/lib/pic14 because aclocal.m4 and config.h.in appear out-of-date. net/rpki-client: Patch Makefile.in instead of Makefile.am to avoid autotools. sysutils/genimage: Run configure with --disable-silent-rules because upstream changed the default to silent and when silent rules are enabled it also runs make with --no-print-directory which is a gmake flag. Patch Makefile.am so it uses --no-print-directory depending on the actual verbosity instead of the default. PR: 280277 Exp-run by: antoineoverlay
Tijl Coosemans
12 months ago
16 changed files with 126 additions and 90 deletions
@ -0,0 +1,53 @@ |
|||
--- configure.ac.orig 2020-11-11 16:11:31 UTC |
|||
+++ configure.ac |
|||
@@ -1,7 +1,8 @@ AC_INIT(libneurosim, 1.2.0, [https://github.com/INCF/l |
|||
dnl Process this file with autoconf to produce configure. |
|||
AC_INIT(libneurosim, 1.2.0, [https://github.com/INCF/libneurosim/issues]) |
|||
-AM_INIT_AUTOMAKE |
|||
-AM_CONFIG_HEADER([config.h]) |
|||
+AM_INIT_AUTOMAKE([subdir-objects]) |
|||
+AC_CONFIG_HEADERS([config.h]) |
|||
+AC_CONFIG_MACRO_DIRS([m4]) |
|||
AM_MAINTAINER_MODE |
|||
|
|||
# Obtain host system type |
|||
@@ -203,21 +204,10 @@ LDFLAGS= |
|||
NS_SET_LDFLAGS |
|||
LDFLAGS= |
|||
|
|||
-LT_PATH_LD |
|||
LT_CONFIG_LTDL_DIR([libltdl]) |
|||
-_LTDL_CONVENIENCE ## put libltdl into a convenience library |
|||
LT_INIT([dlopen]) ## use libtool |
|||
-m4_pattern_allow([LT_LIBEXT]) ## supress false positive message by autoconf |
|||
+LTDL_INIT([recursive]) |
|||
|
|||
-if test "x$BUILD_SHARED" != xno ; then |
|||
- if test "x$LIBLTDL" != x ; then |
|||
- AC_DEFINE(HAVE_LIBLTDL, 1, [Havel libltdl, can load dynamic modules]) |
|||
- fi |
|||
-fi |
|||
- |
|||
-AC_CONFIG_SUBDIRS(libltdl) ## also configure subdir containing libltdl |
|||
-AC_PROG_LIBTOOL |
|||
- |
|||
#-- Set the language to C++ |
|||
AC_LANG_CPLUSPLUS |
|||
|
|||
@@ -237,15 +227,13 @@ AC_SUBST(PYTHON_INCLUDE) |
|||
AC_SUBST(MPI_LIBS) |
|||
AC_SUBST(MPI_INCLUDE) |
|||
AC_SUBST(PYTHON_INCLUDE) |
|||
-AC_SUBST(INCLTDL) |
|||
-AC_SUBST(LIBLTDL) |
|||
-AC_SUBST(HAVE_LIBLTDL) |
|||
AC_SUBST(HAVE_MPI) |
|||
AC_SUBST(NEUROSIM_HAVE_MPI) |
|||
AC_SUBST(LIBADD_DL) |
|||
|
|||
AC_CONFIG_FILES([ |
|||
Makefile |
|||
+ libltdl/Makefile |
|||
neurosim/Makefile |
|||
neurosim/config.h |
|||
neurosim/version.h |
|||
@ -1,3 +1,3 @@ |
|||
TIMESTAMP = 1638700499 |
|||
SHA256 (automake-1.16.5.tar.xz) = f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469 |
|||
SIZE (automake-1.16.5.tar.xz) = 1601740 |
|||
TIMESTAMP = 1720960384 |
|||
SHA256 (automake-1.17.tar.xz) = 8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990 |
|||
SIZE (automake-1.17.tar.xz) = 1652632 |
|||
|
|||
@ -1,14 +0,0 @@ |
|||
--- Makefile.in.orig 2020-11-19 01:24:20 UTC |
|||
+++ Makefile.in |
|||
@@ -3744,9 +3744,9 @@ doc/aclocal.1 doc/automake.1: |
|||
&& echo ".so man1/$$f-$(APIVERSION).1" > $@ |
|||
|
|||
doc/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm |
|||
- $(update_mans) aclocal-$(APIVERSION) |
|||
+ $(update_mans) $(aclocal_script) |
|||
doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm |
|||
- $(update_mans) automake-$(APIVERSION) |
|||
+ $(update_mans) $(automake_script) |
|||
.PHONY: checklinkx |
|||
checklinkx: |
|||
$(checklinkx) $(chlx_args) $(chlx_excludes) $(chlx_file) |
|||
@ -1,16 +0,0 @@ |
|||
--- m4/python.m4.orig 2021-10-04 02:51:12 UTC |
|||
+++ m4/python.m4 |
|||
@@ -37,9 +37,12 @@ AC_DEFUN([AM_PATH_PYTHON], |
|||
dnl Find a Python interpreter. Python versions prior to 2.0 are not |
|||
dnl supported. (2.0 was released on October 16, 2000). |
|||
m4_define_default([_AM_PYTHON_INTERPRETER_LIST], |
|||
-[python python2 python3 dnl |
|||
+[python python3 dnl |
|||
+ python3.20 python3.19 python3.18 python3.17 python3.16 dnl |
|||
+ python3.15 python3.14 python3.13 python3.12 python3.11 python3.10 dnl |
|||
python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl |
|||
python3.2 python3.1 python3.0 dnl |
|||
+ python2 dnl |
|||
python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl |
|||
python2.0]) |
|||
|
|||
@ -0,0 +1,11 @@ |
|||
--- configure.ac.orig 2023-11-23 12:06:21 UTC |
|||
+++ configure.ac |
|||
@@ -11,7 +11,7 @@ AC_REQUIRE_AUX_FILE([tap-driver.sh]) |
|||
# tap-driver.sh, so build-aux/tap-driver.sh is checked in to keep the |
|||
# above AC_REQUIRE_AUX_FILE line from causing configure to complain |
|||
# about a mising file if the user has Automake 1.11.) |
|||
-AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects parallel-tests]) |
|||
+AM_INIT_AUTOMAKE([1.11 -Wall foreign subdir-objects parallel-tests]) |
|||
AM_SILENT_RULES |
|||
|
|||
AC_PROG_MKDIR_P |
|||
@ -0,0 +1,12 @@ |
|||
--- Makefile.am.orig 2024-07-04 14:07:20 UTC |
|||
+++ Makefile.am |
|||
@@ -1,6 +1,6 @@ |
|||
-if BUILD_SILENTLY |
|||
-AM_MAKEFLAGS = --no-print-directory |
|||
-endif |
|||
+AM_MAKEFLAGS = $(AM_MAKEFLAGS_@AM_V@) |
|||
+AM_MAKEFLAGS_ = $(AM_MAKEFLAGS_@AM_DEFAULT_V@) |
|||
+AM_MAKEFLAGS_0 = --no-print-directory |
|||
|
|||
EXTRA_DIST = \ |
|||
README.rst \ |
|||
@ -0,0 +1,12 @@ |
|||
--- configure.ac.orig 2024-07-04 14:07:20 UTC |
|||
+++ configure.ac |
|||
@@ -123,9 +123,6 @@ AC_SUBST(AM_CFLAGS) |
|||
|
|||
AC_SUBST(AM_CFLAGS) |
|||
|
|||
-# be very silent on request |
|||
-AM_CONDITIONAL(BUILD_SILENTLY, test "x$AM_DEFAULT_VERBOSITY" = x0) |
|||
- |
|||
AC_CONFIG_HEADERS(config.h) |
|||
AC_CONFIG_FILES([ |
|||
Makefile |
|||
Loading…
Reference in new issue