CVS commit: pkgsrc/textproc/expat

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Wed Dec 18 15:03:59 UTC 2024

Modified Files:
        pkgsrc/textproc/expat: distinfo
Added Files:
        pkgsrc/textproc/expat/patches:
            patch-cmake_autotools_expat-noconfig____macos.cmake.in

Log Message:
textproc/expat: fix file used by other packages to find installed library

On Darwin, the installed expat shared library includes only the major
version number, not minor version and patch, in the name.  The
corresponding configure check, however, looks for the full name with
all three parts and fails.

The same problem occurs on Windows and is discussed in issue 485, even
mentioning that Darwin likely has the same issue:

    https://github.com/libexpat/libexpat/issues/485

For some reason, the fix (removing minor and patch versions from the
cmake file used by configure) was applied for Windows but not for
Darwin.

See the upstream issue:

    https://github.com/libexpat/libexpat/issues/935

which was closed with

    https://github.com/libexpat/libexpat/pull/937

--- cmake/autotools/expat-noconfig__macos.cmake.in.orig 2023-08-26 12:27:53.000000000 +0000
+++ cmake/autotools/expat-noconfig__macos.cmake.in
@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
 # Import target "expat::expat" for configuration "NoConfig"
 set_property(TARGET expat::expat APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
 set_target_properties(expat::expat PROPERTIES
-  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib"
+  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib"
   IMPORTED_SONAME_NOCONFIG "@rpath/libexpat.@SO_MAJOR@.dylib"
   )

 list(APPEND _cmake_import_check_targets expat::expat )
-list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib" )
+list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib" )

 # Commands beyond this point should not need to know the version.
 set(CMAKE_IMPORT_FILE_VERSION)


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/textproc/expat/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/expat/patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in

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

Modified files:

Index: pkgsrc/textproc/expat/distinfo
diff -u pkgsrc/textproc/expat/distinfo:1.51 pkgsrc/textproc/expat/distinfo:1.52
--- pkgsrc/textproc/expat/distinfo:1.51 Wed Sep  4 13:08:26 2024
+++ pkgsrc/textproc/expat/distinfo      Wed Dec 18 15:03:58 2024
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.51 2024/09/04 13:08:26 adam Exp $
+$NetBSD: distinfo,v 1.52 2024/12/18 15:03:58 brook Exp $
 
 BLAKE2s (expat-2.6.3.tar.gz) = fcc81c1c25ef679e6c93fe93c7c1b0cc5a306f94163d3e53b506917cb6537185
 SHA512 (expat-2.6.3.tar.gz) = 0c0f0df947bbe7084ba2bffce082bc40e061cbf02363f3043e8e6be33b71277dbf13fd54dcc0f641b704293e3faea5b8c1d3c752737db4c908097bf5df8bd02d
 Size (expat-2.6.3.tar.gz) = 764617 bytes
+SHA1 (patch-cmake_autotools_expat-noconfig____macos.cmake.in) = 21411931ba40ca89435a3a41b3c329039540bfa2

Added files:

Index: pkgsrc/textproc/expat/patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in
diff -u /dev/null pkgsrc/textproc/expat/patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in:1.1
--- /dev/null   Wed Dec 18 15:03:59 2024
+++ pkgsrc/textproc/expat/patches/patch-cmake_autotools_expat-noconfig____macos.cmake.in        Wed Dec 18 15:03:58 2024
@@ -0,0 +1,41 @@
+$NetBSD: patch-cmake_autotools_expat-noconfig____macos.cmake.in,v 1.1 2024/12/18 15:03:58 brook Exp $
+
+On Darwin, the installed expat shared library includes only the major
+version number, not minor version and patch, in the name.  The
+corresponding configure check, however, looks for the full name with
+all three parts and fails.
+
+The same problem occurs on Windows and is discussed in issue 485, even
+mentioning that Darwin likely has the same issue:
+
+    https://github.com/libexpat/libexpat/issues/485
+
+For some reason, the fix (removing minor and patch versions from the
+cmake file used by configure) was applied for Windows but not for
+Darwin.
+
+See the upstream issue:
+
+    https://github.com/libexpat/libexpat/issues/935
+
+which was closed with
+
+    https://github.com/libexpat/libexpat/pull/937
+
+--- cmake/autotools/expat-noconfig__macos.cmake.in.orig        2023-08-26 12:27:53.000000000 +0000
++++ cmake/autotools/expat-noconfig__macos.cmake.in
+@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
+ # Import target "expat::expat" for configuration "NoConfig"
+ set_property(TARGET expat::expat APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG)
+ set_target_properties(expat::expat PROPERTIES
+-  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib"
++  IMPORTED_LOCATION_NOCONFIG "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib"
+   IMPORTED_SONAME_NOCONFIG "@rpath/libexpat.@SO_MAJOR@.dylib"
+   )
+ 
+ list(APPEND _cmake_import_check_targets expat::expat )
+-list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.@SO_MINOR@.@SO_PATCH@.dylib" )
++list(APPEND _cmake_import_check_files_for_expat::expat "${_IMPORT_PREFIX}/@LIBDIR_BASENAME@/libexpat.@SO_MAJOR@.dylib" )
+ 
+ # Commands beyond this point should not need to know the version.
+ set(CMAKE_IMPORT_FILE_VERSION)