[gexiv2/gexiv2-0.10] Revert "Add version script to limit exported functions"



commit 3351daca7eb6c6ad7b40fd711094d102aeaf108b
Author: Jens Georg <mail jensge org>
Date:   Wed Jan 9 11:22:17 2019 +0100

    Revert "Add version script to limit exported functions"
    
    This reverts commit 670b3e1d28281138bd72edb133d9cd022a8dd8e2.
    This reverts commit 35751fcbcd725f1e277b63e59fcfd7bb268bbf8a.
    This reverts commit 3c801e70a9ea7271a76a58ce15867923143864a2.
    
    The script breaks more than it fixes. Undoing it for now
    
    Fixes #27

 Makefile.am        |  8 --------
 configure.ac       | 17 -----------------
 gexiv2/gexiv2.map  |  6 ------
 gexiv2/meson.build |  9 ---------
 4 files changed, 40 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b4d5fab..cdb6cb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,6 @@ EXTRA_DIST = \
        gexiv2/gexiv2-enums.cpp.template \
        gexiv2/gexiv2-enums.h.template \
        gexiv2/gexiv2-version.h.meson \
-       gexiv2/gexiv2.map \
        vapi/meson.build \
        test/meson.build \
        meson_options.txt
@@ -154,15 +153,8 @@ lib@PACKAGE_NAME@_la_SOURCES  = $(GEXIV2_sources) $(GEXIV2_public_HEADERS)
 lib@PACKAGE_NAME@_la_LIBADD   = $(EXIV2_LIBS) $(GLIB_LIBS)
 lib@PACKAGE_NAME@_la_CPPFLAGS = $(EXIV2_CFLAGS) $(GLIB_CFLAGS)
 
-if PLATFORM_DARWIN
-VERSION_SCRIPT_LDFLAGS=
-else
-VERSION_SCRIPT_LDFLAGS="-Wl,--version-script=$(srcdir)/gexiv2/gexiv2.map"
-endif
-
 lib@PACKAGE_NAME@_la_LDFLAGS  = \
        $(no_undefined) -export-dynamic -version-info $(GEXIV2_VERSION_INFO) \
-       $(VERSION_SCRIPT_LDFLAGS) \
        $(WARN_LDFLAGS)
 
 clean-local:
diff --git a/configure.ac b/configure.ac
index ce519dd..b322420 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,23 +214,6 @@ case x"$target" in
 esac
 AC_MSG_RESULT([$target_or_host])
 
-#################
-# Check for OS X
-#################
-
-AC_MSG_CHECKING([OS X platform])
-case "$target_or_host" in
-    *-*-darwin*)
-        platform_darwin=yes
-    ;;
-    *)
-        platform_darwin=no
-    ;;
-esac
-AC_MSG_RESULT([$platform_darwin])
-AM_CONDITIONAL(PLATFORM_DARWIN, test "$platform_darwin" = "yes")
-
-
 #################
 # Check for Win32
 #################
diff --git a/gexiv2/meson.build b/gexiv2/meson.build
index bf7bd66..a4446eb 100644
--- a/gexiv2/meson.build
+++ b/gexiv2/meson.build
@@ -33,14 +33,6 @@ enum_sources = gnome.mkenums('gexiv2-enums',
 
 install_headers(gexiv2_headers, subdir : 'gexiv2')
 
-# Static map file
-mapfile = 'gexiv2.map'
-if host_machine.system() == 'darwin'
-    vflag = ''
-else
-    vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)
-endif
-
 gexiv2 = library('gexiv2',
                  ['gexiv2-metadata.cpp',
                   'gexiv2-metadata-exif.cpp',
@@ -60,7 +52,6 @@ gexiv2 = library('gexiv2',
                  gexiv2_headers +
                  [version_header] +
                  enum_sources,
-                 link_args : vflag,
                  include_directories : include_directories('..'),
                  version: '2.0.0',
                  dependencies : [gobject, exiv2],


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]