Accepting request 132480 from home:AndreasSchwab:ff

- Don't ignore $(AM_CFLAGS).
- Remove ppc patch.

OBS-URL: https://build.opensuse.org/request/show/132480
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/flac?expand=0&rev=27
This commit is contained in:
Philipp Thomas 2012-09-04 16:21:24 +00:00 committed by Git OBS Bridge
parent b1dbc1f2ef
commit c8803f4fc2
4 changed files with 7 additions and 17 deletions

View File

@ -1,12 +0,0 @@
Index: flac-1.2.1/src/libFLAC/Makefile.am
===================================================================
--- flac-1.2.1.orig/src/libFLAC/Makefile.am
+++ flac-1.2.1/src/libFLAC/Makefile.am
@@ -68,7 +68,6 @@ endif
endif
endif
endif
-libFLAC_la_CFLAGS = -fvisibility=hidden
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
SUBDIRS = $(ARCH_SUBDIRS) include .

View File

@ -33,7 +33,7 @@ Index: src/libFLAC/Makefile.am
endif
endif
-
+libFLAC_la_CFLAGS = -fvisibility=hidden
+libFLAC_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
SUBDIRS = $(ARCH_SUBDIRS) include .

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 4 10:00:35 UTC 2012 - schwab@linux-m68k.org
- Don't ignore $(AM_CFLAGS).
- Remove ppc patch.
-------------------------------------------------------------------
Tue Mar 13 20:45:17 UTC 2012 - dimstar@opensuse.org

View File

@ -51,7 +51,6 @@ Patch4: flac-1.2.1-bitreader.patch
Patch5: flac-ocloexec.patch
Patch6: flac-visibility.patch
Patch7: flac-leaks.patch
Patch8: flac-disable-hidden-visibility-for-ppc.patch
# PATCH-FIX-UPSTREAM flac-gcc47.patch dimstar@opensuse.org -- Fix build with gcc 4.7
Patch9: flac-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -99,9 +98,6 @@ FLAC library.
%patch5
%patch6
%patch7
%ifarch ppc ppc64
%patch8 -p1
%endif
%patch9 -p1
%build