commit 317a6705b7dd1d38e0f670d7c734458f0e98f776
Author: Jakub Bogusz <[email protected]>
Date: Wed May 24 15:46:01 2017 +0200
- added libdir patch (always honour libdir passed to configure; fixes x32
build)
- release 2
openr2-libdir.patch | 19 +++++++++++++++++++
openr2.spec | 4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/openr2.spec b/openr2.spec
index b233436..0010d23 100644
--- a/openr2.spec
+++ b/openr2.spec
@@ -6,7 +6,7 @@ Summary: OpenR2 - MFC/R2 signalling over E1 lines
Summary(pl.UTF-8): OpenR2 - sygnały MFC/R2 po liniach E1
Name: openr2
Version: 1.3.2
-Release: 1
+Release: 2
License: LGPL v2+ (library), GPL v2+ (utilities)
Group: Libraries
#Source0Download: https://github.com/moises-silva/openr2/releases
@@ -14,6 +14,7 @@ Source0:
https://github.com/moises-silva/openr2/archive/v%{version}/%{name}-%{ve
# Source0-md5: 5858020ad014c111f6f7a8c86758da6c
Patch0: %{name}-nosvn.patch
Patch1: %{name}-opt.patch
+Patch2: %{name}-libdir.patch
URL: https://libopenr2.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -59,6 +60,7 @@ Statyczna biblioteka OpenR2.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
diff --git a/openr2-libdir.patch b/openr2-libdir.patch
new file mode 100644
index 0000000..695842d
--- /dev/null
+++ b/openr2-libdir.patch
@@ -0,0 +1,19 @@
+--- openr2-1.3.2/configure.in.orig 2017-05-24 15:38:44.947201526 +0200
++++ openr2-1.3.2/configure.in 2017-05-24 15:42:28.244836997 +0200
+@@ -32,16 +32,6 @@
+ AC_PROG_LIBTOOL
+ AC_LANG([C])
+
+-if test "${build}" == "${host}"
+-then
+- case "${host}" in
+- x86_64-*)
+- # X86_64 Linux machines may have both 64 bit and 32 bit libraries. We
need to choose the right set
+- AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='${exec_prefix}/lib64')
+- ;;
+- esac
+-fi
+-
+ AC_CHECK_LIB([m],[cosf], [], [AC_MSG_FAILURE([library libm is required but
not present])])
+ AC_CHECK_HEADER([math.h],[],[AC_MSG_FAILURE([header math.h is required but
not present])])
+ AC_CHECK_HEADER([pthread.h],[],[AC_MSG_FAILURE([header pthread.h is required
but not present])])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openr2.git/commitdiff/317a6705b7dd1d38e0f670d7c734458f0e98f776
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
