Source: odb-api
Version: 0.18.1-7
Severity: important
Tags: patch
Hello,
odb-api currently FTBFS on hurd-i386 due to missing build rules. I have
attached a patch that fixes this.
Samuel
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
'testing-proposed-updates-debug'), (500, 'testing-proposed-updates'), (500,
'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500,
'proposed-updates'), (500, 'oldstable-proposed-updates-debug'), (500,
'oldstable-proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'),
(500, 'unstable'), (500, 'stable'), (500, 'oldstable'), (1,
'experimental-debug'), (1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.3.0 (SMP w/8 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8),
LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
--
Samuel
Progress (n.): The process through which the Internet has evolved from
smart people in front of dumb terminals to dumb people in front of smart
terminals.
Index: odb-api-0.18.1/cmake/FindAIO.cmake
===================================================================
--- odb-api-0.18.1.orig/cmake/FindAIO.cmake
+++ odb-api-0.18.1/cmake/FindAIO.cmake
@@ -9,7 +9,7 @@
# OUTPUT:
# RT_LIB = the library to link against
-if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+if( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "GNU" )
find_package( Realtime )
Index: odb-api-0.18.1/ecbuild/cmake/FindAIO.cmake
===================================================================
--- odb-api-0.18.1.orig/ecbuild/cmake/FindAIO.cmake
+++ odb-api-0.18.1/ecbuild/cmake/FindAIO.cmake
@@ -9,7 +9,7 @@
# OUTPUT:
# RT_LIB = the library to link against
-if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+if( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "GNU" )
find_package( Realtime )
Index: odb-api-0.18.1/ecbuild/share/ecbuild/cmake/FindAIO.cmake
===================================================================
--- odb-api-0.18.1.orig/ecbuild/share/ecbuild/cmake/FindAIO.cmake
+++ odb-api-0.18.1/ecbuild/share/ecbuild/cmake/FindAIO.cmake
@@ -9,7 +9,7 @@
# OUTPUT:
# RT_LIB = the library to link against
-if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+if( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "GNU" )
find_package( Realtime )
Index: odb-api-0.18.1/odb/src/extras/ec/julian.h
===================================================================
--- odb-api-0.18.1.orig/odb/src/extras/ec/julian.h
+++ odb-api-0.18.1/odb/src/extras/ec/julian.h
@@ -29,7 +29,7 @@ Author: Dr. Umberto Modigliani, User Sup
#include <ctype.h>
#include <time.h>
#include <unistd.h>
-#if !defined(__alpha) && !defined(linux) && !defined(_AIX43) &&
!defined(CYGWIN)
+#if !defined(__alpha) && !defined(linux) && !defined(_AIX43) &&
!defined(CYGWIN) && !defined(__GNU__)
#include <pfmt.h>
#endif
#include <limits.h>
Index: odb-api-0.18.1/odb/src/compiler/regex.c
===================================================================
--- odb-api-0.18.1.orig/odb/src/compiler/regex.c
+++ odb-api-0.18.1/odb/src/compiler/regex.c
@@ -2,7 +2,7 @@
/* See also lib/wildcard.c */
-#if defined(LINUX) || defined(SUN4) || defined(RS6K)
+#if defined(LINUX) || defined(SUN4) || defined(RS6K) || defined(__GNU__)
/* Watch for this; This GNU-thing may now be okay for other systems, too */
#include <regex.h>
#define REGEX_DEF(p) regex_t p
Index: odb-api-0.18.1/odb/src/lib/wildcard.c
===================================================================
--- odb-api-0.18.1.orig/odb/src/lib/wildcard.c
+++ odb-api-0.18.1/odb/src/lib/wildcard.c
@@ -2,7 +2,7 @@
#include "evaluate.h"
#include "cdrhook.h"
-#if defined(LINUX) || defined(SUN4) || defined(RS6K) || defined(SV2)
+#if defined(LINUX) || defined(SUN4) || defined(RS6K) || defined(SV2) ||
defined(__GNU__)
/* Watch for this; This GNU-thing may now be okay for other systems, too */
#include <regex.h>
#define REGEX_DEF(p) regex_t p
Index: odb-api-0.18.1/cmake/ecbuild_append_to_rpath.cmake
===================================================================
--- odb-api-0.18.1.orig/cmake/ecbuild_append_to_rpath.cmake
+++ odb-api-0.18.1/cmake/ecbuild_append_to_rpath.cmake
@@ -87,6 +87,11 @@ macro( ecbuild_append_to_rpath RPATH_DIR
set( _done 1 )
endif()
+ if( EC_OS_NAME STREQUAL "hurd" )
+ _path_append( CMAKE_INSTALL_RPATH
"$ORIGIN/${RPATH_DIR}" )
+ set( _done 1 )
+ endif()
+
# fallback
if( NOT _done )
Index: odb-api-0.18.1/cmake/ecbuild_check_os.cmake
===================================================================
--- odb-api-0.18.1.orig/cmake/ecbuild_check_os.cmake
+++ odb-api-0.18.1/cmake/ecbuild_check_os.cmake
@@ -372,6 +372,14 @@ if( ${CMAKE_SYSTEM_NAME} MATCHES "CYGWIN
endif()
+### GNU/Hurd
+
+if( ${CMAKE_SYSTEM_NAME} MATCHES "GNU" )
+
+ set( EC_OS_NAME "hurd" )
+
+endif()
+
### final warning / error
if( ${EC_OS_NAME} MATCHES "UNKNOWN" )
Index: odb-api-0.18.1/ecbuild/cmake/ecbuild_append_to_rpath.cmake
===================================================================
--- odb-api-0.18.1.orig/ecbuild/cmake/ecbuild_append_to_rpath.cmake
+++ odb-api-0.18.1/ecbuild/cmake/ecbuild_append_to_rpath.cmake
@@ -87,6 +87,11 @@ macro( ecbuild_append_to_rpath RPATH_DIR
set( _done 1 )
endif()
+ if( EC_OS_NAME STREQUAL "hurd" )
+ _path_append( CMAKE_INSTALL_RPATH
"$ORIGIN/${RPATH_DIR}" )
+ set( _done 1 )
+ endif()
+
# fallback
if( NOT _done )
Index: odb-api-0.18.1/ecbuild/cmake/ecbuild_check_os.cmake
===================================================================
--- odb-api-0.18.1.orig/ecbuild/cmake/ecbuild_check_os.cmake
+++ odb-api-0.18.1/ecbuild/cmake/ecbuild_check_os.cmake
@@ -372,6 +372,14 @@ if( ${CMAKE_SYSTEM_NAME} MATCHES "CYGWIN
endif()
+### GNU/Hurd
+
+if( ${CMAKE_SYSTEM_NAME} MATCHES "GNU" )
+
+ set( EC_OS_NAME "hurd" )
+
+endif()
+
### final warning / error
if( ${EC_OS_NAME} MATCHES "UNKNOWN" )
Index: odb-api-0.18.1/ecbuild/share/ecbuild/cmake/ecbuild_append_to_rpath.cmake
===================================================================
---
odb-api-0.18.1.orig/ecbuild/share/ecbuild/cmake/ecbuild_append_to_rpath.cmake
+++ odb-api-0.18.1/ecbuild/share/ecbuild/cmake/ecbuild_append_to_rpath.cmake
@@ -87,6 +87,11 @@ macro( ecbuild_append_to_rpath RPATH_DIR
set( _done 1 )
endif()
+ if( EC_OS_NAME STREQUAL "hurd" )
+ _path_append( CMAKE_INSTALL_RPATH
"$ORIGIN/${RPATH_DIR}" )
+ set( _done 1 )
+ endif()
+
# fallback
if( NOT _done )
Index: odb-api-0.18.1/ecbuild/share/ecbuild/cmake/ecbuild_check_os.cmake
===================================================================
--- odb-api-0.18.1.orig/ecbuild/share/ecbuild/cmake/ecbuild_check_os.cmake
+++ odb-api-0.18.1/ecbuild/share/ecbuild/cmake/ecbuild_check_os.cmake
@@ -372,6 +372,14 @@ if( ${CMAKE_SYSTEM_NAME} MATCHES "CYGWIN
endif()
+### GNU/Hurd
+
+if( ${CMAKE_SYSTEM_NAME} MATCHES "GNU" )
+
+ set( EC_OS_NAME "hurd" )
+
+endif()
+
### final warning / error
if( ${EC_OS_NAME} MATCHES "UNKNOWN" )
