fix compiler and flags passing to make

diff --git a/ldconfig.patch b/ldconfig.patch
deleted file mode 100644 (file)
index f25a708..0000000
--- a/ldconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur zita-alsa-pcmi-0.2.0.orig/libs/Makefile zita-alsa-pcmi-0.2.0/libs/Makefile
---- zita-alsa-pcmi-0.2.0.orig/libs/Makefile    2012-03-20 21:23:07.000000000 +0100
-+++ zita-alsa-pcmi-0.2.0/libs/Makefile 2016-10-15 11:35:18.419264378 +0200
-@@ -52,7 +52,7 @@
-       install -Dm 644 $(ZITA-ALSA-PCMI_H)   $(DESTDIR)$(PREFIX)/include/$(ZITA-ALSA-PCMI_H)
-       install -Dm 644 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MIN)
-       ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
--      ldconfig
-+      /sbin/ldconfig -n -N $(DESTDIR)$(PREFIX)/$(LIBDIR)
- 
- uninstall:
-       rm -rf $(DESTDIR)$(PREFIX)/include/zita-alsa-pcmi.h

diff --git a/makefile.patch b/makefile.patch
new file mode 100644 (file)
index 0000000..5a2371e
--- /dev/null
+++ b/makefile.patch
@@ -0,0 +1,59 @@
+diff -dur zita-alsa-pcmi-0.2.0.orig/apps/Makefile zita-alsa-pcmi-0.2.0/apps/Makefile
+--- zita-alsa-pcmi-0.2.0.orig/apps/Makefile    2012-03-20 21:23:07.000000000 +0100
++++ zita-alsa-pcmi-0.2.0/apps/Makefile 2016-10-15 12:35:42.895883965 +0200
+@@ -25,7 +25,7 @@
+ VERSION = "0.1.0"
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+ CPPFLAGS += -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O2 -Wall -MMD -MP
++CXXFLAGS += -Wall -MMD -MP
+ 
+ 
+ all:  alsa_loopback alsa_delay
+@@ -34,7 +34,7 @@
+ ALSA_LOOPBACK_O =     alsa_loopback.o pxthread.o
+ alsa_loopback:        LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
+ alsa_loopback:        $(ALSA_LOOPBACK_O)
+-      g++ $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
++      $(CXX) $(LDFLAGS) -o $@ $(ALSA_LOOPBACK_O) $(LDLIBS)
+ $(ALSA_LOOPBACK_O):
+ -include $(_ALSA_LOOPBACK_O:%.o=%.d)
+ 
+@@ -42,7 +42,7 @@
+ ALSA_DELAY_O =        alsa_delay.o mtdm.o pxthread.o
+ alsa_delay:   LDLIBS += -lzita-alsa-pcmi -lasound -lpthread -lrt
+ alsa_delay:   $(ALSA_DELAY_O)
+-      g++ $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
++      $(CXX) $(LDFLAGS) -o $@ $(ALSA_DELAY_O) $(LDLIBS)
+ $(ALSA_DELAY_O):
+ -include $(ALSA_DELAY_O:%.o=%.d)
+ 
+diff -dur zita-alsa-pcmi-0.2.0.orig/libs/Makefile zita-alsa-pcmi-0.2.0/libs/Makefile
+--- zita-alsa-pcmi-0.2.0.orig/libs/Makefile    2012-03-20 21:23:07.000000000 +0100
++++ zita-alsa-pcmi-0.2.0/libs/Makefile 2016-10-15 12:35:36.072491159 +0200
+@@ -31,7 +31,7 @@
+ 
+ 
+ CPPFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CXXFLAGS += -O2 -Wall -I. -fPIC
++CXXFLAGS += -Wall -I. -fPIC
+ LDLFAGS +=
+ LDLIBS +=
+ 
+@@ -45,14 +45,14 @@
+ 
+ 
+ $(ZITA-ALSA-PCMI_MIN): $(ZITA-ALSA-PCMI_O)
+-      g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o $(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
++      $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-ALSA-PCMI_MAJ) -o $(ZITA-ALSA-PCMI_MIN) $(ZITA-ALSA-PCMI_O) $(ZITA-ALSA-PCMI_DEP)
+ 
+ 
+ install:      $(ZITA-ALSA-PCMI_MIN)
+       install -Dm 644 $(ZITA-ALSA-PCMI_H)   $(DESTDIR)$(PREFIX)/include/$(ZITA-ALSA-PCMI_H)
+       install -Dm 644 $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_MIN)
+       ln -sf $(ZITA-ALSA-PCMI_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-ALSA-PCMI_SO)
+-      ldconfig
++      /sbin/ldconfig -n -N $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 
+ uninstall:
+       rm -rf $(DESTDIR)$(PREFIX)/include/zita-alsa-pcmi.h

diff --git a/zita-alsa-pcmi.spec b/zita-alsa-pcmi.spec
index 3401e520382a3f2b98f1ea6fb9399ef7be16b155..365f406340d101a08cee8e894d91ff5b3c6a4628 100644 (file)
--- a/zita-alsa-pcmi.spec
+++ b/zita-alsa-pcmi.spec
@@ -6,7 +6,7 @@ License:        GPL v3+
 Group:         Libraries
 Source0:       http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
 # Source0-md5: 0ba4d59abce231056e2628d081124114
-Patch0:                ldconfig.patch
+Patch0:                makefile.patch
 URL:           http://kokkinizita.linuxaudio.org/linuxaudio/
 BuildRequires: alsa-lib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,18 +47,20 @@ Przykładowe aplikacje biblioteki %{name}.
 
 %build
 cd libs
-%{__make} \
-       CXXFLAGS="%{rpmcxxflags}" \
-       CPPFLAGS="%{rpmcppflags}" \
-       LDFLAGS="%{rpmldflags}"
+CXX="%{__cxx}" \
+CXXFLAGS="%{rpmcxxflags}" \
+CPPFLAGS="%{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
+%{__make}
 ln -sf libzita-alsa-pcmi.so.* libzita-alsa-pcmi.so
 cd ..
 
 cd apps
-%{__make} \
-       CXXFLAGS="%{rpmcxxflags}" \
-       CPPFLAGS="%{rpmcppflags} -I../libs" \
-       LDFLAGS="%{rpmldflags} -L../libs"
+CXX="%{__cxx}" \
+CXXFLAGS="%{rpmcxxflags}" \
+CPPFLAGS="%{rpmcppflags} -I../libx" \
+LDFLAGS="%{rpmldflags} -L../libs" \
+%{__make}
 cd ..
 
 %install