[Nickle] nickle: Branch 'master' - 3 commits

Keith Packard keithp at keithp.com
Tue Oct 29 09:59:20 PDT 2024


 configure.ac     |    4 ++--
 debian/changelog |    7 +++++++
 meson.build      |   12 ++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit b666ff3044b27c9bb496c1e154d073afe0abfc94
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Oct 29 09:33:34 2024 -0700

    Version 2.99
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 80fa7ed..e268431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@ dnl for licensing information.
 
 AC_PREREQ([2.69])
 
-AC_INIT([nickle],[2.98],[http://nickle.org],[nickle])
-RELEASE_DATE="2024-10-28"
+AC_INIT([nickle],[2.99],[http://nickle.org],[nickle])
+RELEASE_DATE="2024-10-29"
 AC_CONFIG_SRCDIR([nickle.h])
 AC_CONFIG_HEADERS([nickle-config.h])
 AC_CONFIG_AUX_DIR(.)
diff --git a/debian/changelog b/debian/changelog
index c1d9a92..9009631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nickle (2.99) unstable; urgency=medium
+
+  * Install the binary
+  * Add -Wl,-E link args
+
+ -- Keith Packard <keithp at keithp.com>  Tue, 29 Oct 2024 09:32:11 -0700
+
 nickle (2.98) unstable; urgency=medium
 
   * Add gnomesort
diff --git a/meson.build b/meson.build
index e4ab4f1..8627ef8 100644
--- a/meson.build
+++ b/meson.build
@@ -12,10 +12,10 @@ project('nickle', 'c',
 	],
 	license : 'BSD',
 	meson_version : '>= 1.0',
-	version: '2.98'
+	version: '2.99'
        )
 
-release_date = '2024-10-28'
+release_date = '2024-10-29'
 
 prefix = get_option('prefix')
 include = prefix / get_option('includedir')
commit e6df6668749846e38f31f29c94a5dc71a434aef7
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Oct 29 09:47:34 2024 -0700

    Use -Wl,-E when linking
    
    This lets libraries find internal symbols
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/meson.build b/meson.build
index 43e14c0..e4ab4f1 100644
--- a/meson.build
+++ b/meson.build
@@ -65,6 +65,9 @@ add_project_arguments(cc.get_supported_arguments(
   ]),
 		      language: 'c')
 
+link_args = cc.get_supported_link_arguments('-Wl,-E')
+have_extern_syms = link_args != []
+
 if get_option('libedit')
   readline_dep = dependency('libedit')
   readline_h = '<readline.h>'
@@ -85,7 +88,6 @@ have_dlerror = cc.has_function('dlerror')
 have_dlfcn_h = cc.has_header('dlfcn.h')
 have_dlopen = cc.has_function('dlopen')
 have_dlsym = cc.has_function('dlsym')
-have_extern_syms = cc.has_link_argument('-Wl,-E')
 have_fcntl_h = cc.has_header('fcntl.h')
 have_getrlimit = cc.has_function('getrlimit')
 have_gettimeofday = cc.has_function('gettimeofday')
@@ -257,7 +259,8 @@ install_data(nickle_files,
 nickle = executable('nickle', nickle_srcs,
 		    dependencies : [ readline_dep, math_dep ],
 		    include_directories : include_directories('.'),
-		   install: true)
+		    link_args: link_args,
+		    install: true)
 
 test_env = environment(
   {
commit a61f0b95b765c44c5d0e3fbd884d0e79325938df
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Oct 29 09:31:36 2024 -0700

    Actually install nickle
    
    Missed the 'install: true' clause.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/meson.build b/meson.build
index 1b3cc4c..43e14c0 100644
--- a/meson.build
+++ b/meson.build
@@ -256,7 +256,8 @@ install_data(nickle_files,
 
 nickle = executable('nickle', nickle_srcs,
 		    dependencies : [ readline_dep, math_dep ],
-		    include_directories : include_directories('.'))
+		    include_directories : include_directories('.'),
+		   install: true)
 
 test_env = environment(
   {


More information about the Nickle mailing list