link libatomic_ops_gpl against libatomic_ops for missing symbol(s)

This commit is contained in:
Rex Dieter 2014-05-13 18:58:03 -05:00
parent e2ccefb396
commit 33da39d4a8
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,23 @@
diff -up libatomic_ops-7.4.2/src/Makefile.am.no_undefined libatomic_ops-7.4.2/src/Makefile.am
--- libatomic_ops-7.4.2/src/Makefile.am.no_undefined 2014-05-02 10:52:15.000000000 -0500
+++ libatomic_ops-7.4.2/src/Makefile.am 2014-05-13 18:51:29.620033510 -0500
@@ -12,6 +12,7 @@ libatomic_ops_la_LDFLAGS = -version-info
libatomic_ops_gpl_la_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c
libatomic_ops_gpl_la_LDFLAGS = -version-info 1:3:0 -no-undefined
+libatomic_ops_gpl_la_LIBADD = libatomic_ops.la
EXTRA_DIST = Makefile.msft atomic_ops/sysdeps/README \
atomic_ops/generalize-arithm.template \
diff -up libatomic_ops-7.4.2/src/Makefile.in.no_undefined libatomic_ops-7.4.2/src/Makefile.in
--- libatomic_ops-7.4.2/src/Makefile.in.no_undefined 2014-05-02 10:56:32.000000000 -0500
+++ libatomic_ops-7.4.2/src/Makefile.in 2014-05-13 18:51:55.352602385 -0500
@@ -139,7 +139,7 @@ libatomic_ops_la_LINK = $(LIBTOOL) $(AM_
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(libatomic_ops_la_LDFLAGS) $(LDFLAGS) \
-o $@
-libatomic_ops_gpl_la_LIBADD =
+libatomic_ops_gpl_la_LIBADD = libatomic_ops.la
am_libatomic_ops_gpl_la_OBJECTS = atomic_ops_stack.lo \
atomic_ops_malloc.lo
libatomic_ops_gpl_la_OBJECTS = $(am_libatomic_ops_gpl_la_OBJECTS)

View File

@ -2,7 +2,7 @@
Name: libatomic_ops
Summary: Atomic memory update operations
Version: 7.4.2
Release: 1%{?dist}
Release: 2%{?dist}
# libatomic_ops MIT, libatomic_ops_gpl GPLv2
License: GPLv2 and MIT
@ -12,6 +12,13 @@ Source0: http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-%{version}.tar.g
# updated GPLv2 license text
Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
## upstreamable patches
# link libatomic_ops_gpl against libatomic_ops for missing symbol(s)
Patch50: libatomic_ops-7.4.2-no_undefined.patch
# re-autofoo for patch50
BuildRequires: automake libtool
%description
Provides implementations for atomic memory update operations on a
number of architectures. This allows direct use of these in reasonably
@ -35,6 +42,11 @@ Files for developing with %{name} and linking statically.
%prep
%setup -q
%patch50 -p1 -b .no_undefined
# patch50 introduces rpath (probably due to older libtool), refresh stuff here
autoreconf -fi
install -m644 -p %{SOURCE1} ./COPYING
@ -87,6 +99,9 @@ make check %{?arch_ignore}
%changelog
* Tue May 13 2014 Rex Dieter <rdieter@fedoraproject.org> 7.4.2-2
- link libatomic_ops_gpl against libatomic_ops for missing symbol(s)
* Tue May 13 2014 Rex Dieter <rdieter@fedoraproject.org> 7.4.2-1
- libatomic_opts-7.4.2
- new upstream/source URLs