Skip to content

Commit

Permalink
relocatable-lib-lgpl: Add support for mingw builds on Cygwin hosts.
Browse files Browse the repository at this point in the history
Reported by Michele Locati <michele@locati.it> in
<https://lists.gnu.org/archive/html/bug-gettext/2024-09/msg00033.html>.

* m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY_BODY): Use
gl_BUILD_TO_HOST on the value of INSTALLPREFIX.
* modules/relocatable-lib (Files): Add m4/build-to-host.m4.
* modules/relocatable-lib-lgpl (Files): Likewise.
* modules/relocatable-prog-wrapper (Files): Likewise.
  • Loading branch information
bhaible committed Sep 26, 2024
1 parent eb51539 commit d340654
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
2024-09-25 Bruno Haible <bruno@clisp.org>

relocatable-lib-lgpl: Add support for mingw builds on Cygwin hosts.
Reported by Michele Locati <michele@locati.it> in
<https://lists.gnu.org/archive/html/bug-gettext/2024-09/msg00033.html>.
* m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY_BODY): Use
gl_BUILD_TO_HOST on the value of INSTALLPREFIX.
* modules/relocatable-lib (Files): Add m4/build-to-host.m4.
* modules/relocatable-lib-lgpl (Files): Likewise.
* modules/relocatable-prog-wrapper (Files): Likewise.

2024-09-25 Bruno Haible <bruno@clisp.org>

build-to-host.m4: Add some convenience macros.
Expand Down
6 changes: 4 additions & 2 deletions m4/relocatable-lib.m4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# relocatable-lib.m4
# serial 7
# serial 8
dnl Copyright (C) 2003, 2005-2007, 2009-2024 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
Expand All @@ -21,7 +21,9 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY],
else
reloc_final_prefix="$prefix"
fi
AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"],
dnl Define reloc_final_prefix_c and reloc_final_prefix_c_make.
gl_BUILD_TO_HOST([reloc_final_prefix])
AC_DEFINE_UNQUOTED([INSTALLPREFIX], [${reloc_final_prefix_c}],
[Define to the value of ${prefix}, as a string.])
if test $RELOCATABLE = yes; then
AC_DEFINE([ENABLE_RELOCATABLE], [1],
Expand Down
1 change: 1 addition & 0 deletions modules/relocatable-lib
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ lib/relocatable.h
lib/relocatable.c
lib/relocatable.valgrind
m4/relocatable-lib.m4
m4/build-to-host.m4

Depends-on:
xalloc
Expand Down
1 change: 1 addition & 0 deletions modules/relocatable-lib-lgpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ lib/relocatable.h
lib/relocatable.c
lib/relocatable.valgrind
m4/relocatable-lib.m4
m4/build-to-host.m4

Depends-on:
strdup
Expand Down
1 change: 1 addition & 0 deletions modules/relocatable-prog-wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ m4/rawmemchr.m4
m4/readlink.m4
m4/realloc.m4
m4/relocatable-lib.m4
m4/build-to-host.m4
m4/setenv.m4

Depends-on:
Expand Down

0 comments on commit d340654

Please sign in to comment.