aboutsummaryrefslogtreecommitdiff
path: root/libgm2
diff options
context:
space:
mode:
Diffstat (limited to 'libgm2')
-rw-r--r--libgm2/ChangeLog17
-rw-r--r--libgm2/libm2iso/ErrnoCategory.cc12
-rw-r--r--libgm2/libm2iso/Makefile.am2
-rw-r--r--libgm2/libm2iso/Makefile.in2
-rw-r--r--libgm2/libm2log/Makefile.am2
-rw-r--r--libgm2/libm2log/Makefile.in2
-rw-r--r--libgm2/libm2pim/Makefile.am2
-rw-r--r--libgm2/libm2pim/Makefile.in2
8 files changed, 33 insertions, 8 deletions
diff --git a/libgm2/ChangeLog b/libgm2/ChangeLog
index ebee2c0..fb9920e 100644
--- a/libgm2/ChangeLog
+++ b/libgm2/ChangeLog
@@ -1,3 +1,20 @@
+2025-03-28 Gaius Mulley <gaiusmod2@gmail.com>
+
+ PR modula2/118045
+ * libm2iso/Makefile.am (libm2iso_la_LINK): Add -lm.
+ * libm2log/Makefile.am (libm2log_la_LINK): Ditto.
+ * libm2pim/Makefile.am (libm2pim_la_LINK): Ditto.
+ * libm2iso/Makefile.in: Regenerate.
+ * libm2log/Makefile.in: Regenerate.
+ * libm2pim/Makefile.in: Regenerate.
+
+2025-03-20 Gaius Mulley <gaiusmod2@gmail.com>
+
+ * libm2iso/ErrnoCategory.cc (IsErrnoHard): Defend against
+ lack of ENOTBLK.
+ (UnAvailable): Ditto.
+ (GetOpenResults): Ditto.
+
2024-11-20 Gaius Mulley <gaiusmod2@gmail.com>
PR modula2/117703
diff --git a/libgm2/libm2iso/ErrnoCategory.cc b/libgm2/libm2iso/ErrnoCategory.cc
index 053c75b..d1dcb15 100644
--- a/libgm2/libm2iso/ErrnoCategory.cc
+++ b/libgm2/libm2iso/ErrnoCategory.cc
@@ -50,7 +50,10 @@ EXPORT(IsErrnoHard) (int e)
{
#if defined(HAVE_ERRNO_H) || defined(HAVE_SYS_ERRNO_H)
return ((e == EPERM) || (e == ENOENT) || (e == EIO) || (e == ENXIO)
- || (e == EACCES) || (e == ENOTBLK) || (e == ENODEV) || (e == EINVAL)
+ || (e == EACCES) || (e == ENODEV) || (e == EINVAL)
+#ifdef ENOTBLK
+ || (e == ENOTBLK)
+#endif
|| (e == ENFILE) || (e == EROFS) || (e == EMLINK));
#else
return false;
@@ -79,7 +82,10 @@ EXPORT(UnAvailable) (int e)
{
#if defined(HAVE_ERRNO_H) || defined(HAVE_SYS_ERRNO_H)
return ((e == ENOENT) || (e == ESRCH) || (e == ENXIO) || (e == ECHILD)
- || (e == ENOTBLK) || (e == ENODEV) || (e == ENOTDIR));
+#ifdef ENOTBLK
+ || (e == ENOTBLK)
+#endif
+ || (e == ENODEV) || (e == ENOTDIR));
#else
return false;
#endif
@@ -108,9 +114,11 @@ EXPORT(GetOpenResults) (int e)
case EACCES:
return wrongPermissions;
break;
+#ifdef ENOTBLK
case ENOTBLK:
return wrongFileType;
break;
+#endif
case EEXIST:
return fileExists;
break;
diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am
index ee9afde..12ea38f 100644
--- a/libgm2/libm2iso/Makefile.am
+++ b/libgm2/libm2iso/Makefile.am
@@ -215,7 +215,7 @@ if ENABLE_DARWIN_AT_RPATH
libm2iso_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/
endif
-libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2iso_la_link_flags)
+libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2iso_la_link_flags) -lm
CLEANFILES = SYSTEM.def
BUILT_SOURCES = SYSTEM.def
diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in
index 370837f..628d942 100644
--- a/libgm2/libm2iso/Makefile.in
+++ b/libgm2/libm2iso/Makefile.in
@@ -597,7 +597,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1)
@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_TRUE@libm2iso_la_link_flags = -Wl,-undefined,dynamic_lookup \
@BUILD_ISOLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1)
-@BUILD_ISOLIB_TRUE@libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2iso_la_link_flags)
+@BUILD_ISOLIB_TRUE@libm2iso_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2iso_la_link_flags) -lm
@BUILD_ISOLIB_TRUE@CLEANFILES = SYSTEM.def
@BUILD_ISOLIB_TRUE@BUILT_SOURCES = SYSTEM.def
@BUILD_ISOLIB_TRUE@M2LIBDIR = /m2/m2iso/
diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am
index ac690c8..8da0d14 100644
--- a/libgm2/libm2log/Makefile.am
+++ b/libgm2/libm2log/Makefile.am
@@ -147,7 +147,7 @@ endif
if ENABLE_DARWIN_AT_RPATH
libm2log_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/
endif
-libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags)
+libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags) -lm
BUILT_SOURCES = ../libm2pim/SYSTEM.def
M2LIBDIR = /m2/m2log/
diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in
index 45260a6..6df3f16 100644
--- a/libgm2/libm2log/Makefile.in
+++ b/libgm2/libm2log/Makefile.in
@@ -492,7 +492,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1)
@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@libm2log_la_link_flags = -Wl,-undefined,dynamic_lookup \
@BUILD_LOGLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1)
-@BUILD_LOGLIB_TRUE@libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags)
+@BUILD_LOGLIB_TRUE@libm2log_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2log_la_link_flags) -lm
@BUILD_LOGLIB_TRUE@BUILT_SOURCES = ../libm2pim/SYSTEM.def
@BUILD_LOGLIB_TRUE@M2LIBDIR = /m2/m2log/
all: $(BUILT_SOURCES)
diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am
index b575cab..2252f28 100644
--- a/libgm2/libm2pim/Makefile.am
+++ b/libgm2/libm2pim/Makefile.am
@@ -183,7 +183,7 @@ endif
if ENABLE_DARWIN_AT_RPATH
libm2pim_la_link_flags += -nodefaultrpaths -Wl,-rpath,@loader_path/
endif
-libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags)
+libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags) -lm
BUILT_SOURCES = SYSTEM.def
CLEANFILES = SYSTEM.def
diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in
index 67a882e..f4313e9 100644
--- a/libgm2/libm2pim/Makefile.in
+++ b/libgm2/libm2pim/Makefile.in
@@ -556,7 +556,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS)
@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_FALSE@ $(am__append_1)
@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_TRUE@libm2pim_la_link_flags = -Wl,-undefined,dynamic_lookup \
@BUILD_PIMLIB_TRUE@@TARGET_DARWIN_TRUE@ $(am__append_1)
-@BUILD_PIMLIB_TRUE@libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags)
+@BUILD_PIMLIB_TRUE@libm2pim_la_LINK = $(LINK) -version-info $(libtool_VERSION) $(libm2pim_la_link_flags) -lm
@BUILD_PIMLIB_TRUE@BUILT_SOURCES = SYSTEM.def
@BUILD_PIMLIB_TRUE@CLEANFILES = SYSTEM.def
@BUILD_PIMLIB_TRUE@M2LIBDIR = /m2/m2pim/
generated by cgit v1.1 at 2025-04-03 21:39:00 +0000