rpms/pnm2ppa
7
0
Fork 0
Code Issues Pull Requests Releases Activity

1548734 - pnm2ppa: Partial Fedora build flags injection

Browse Source
This commit is contained in:
Zdenek Dohnal 2018-03-02 15:45:07 +01:00
parent 55a55f05b8
commit 129ddf7c49
2 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pnm2ppa-ldflags.patch Normal file
View File

@ -0,0 +1,52 @@
diff -up pnm2ppa-1.04/Makefile.ldflags pnm2ppa-1.04/Makefile
--- pnm2ppa-1.04/Makefile.ldflags 2018-03-01 15:38:09.225582684 +0100
+++ pnm2ppa-1.04/Makefile 2018-03-01 15:50:34.307261745 +0100
@@ -11,7 +11,6 @@ INSTALL=install
# production build
CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG
-LDFLAGS=-lm
OBJS = pnm2ppa.o syslog.o ppa.o image.o dither.o cutswath.o hash_ink.o gamma.o
SRC = pnm2ppa.c syslog.c ppa.c image.c dither.c cutswath.c hash_ink.c gamma.c
@@ -108,10 +107,10 @@ uninstall:
rm -f $(CONFDIR)/pnm2ppa.conf
pnm2ppa: $(OBJS)
- $(CC) $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o pnm2ppa $(OBJS)
calibrate_ppa: calibrate_ppa.o pnmtools.o gamma.o
- $(CC) $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o
+ $(CC) -lm $(LDFLAGS) $(CFLAGS) -o calibrate_ppa calibrate_ppa.o pnmtools.o gamma.o
calibrate_ppa.o: calibrate_ppa.c global.h image.h defaults.h pnmtools.h
$(CC) $(CFLAGS) -c calibrate_ppa.c
@@ -144,7 +143,7 @@ syslog.o: syslog.c syslog.h global.h
$(CC) $(CFLAGS) -c syslog.c
make_hash_ink: make_hash_ink.c palette.h hash_ink.h
- $(CC) $(CFLAGS) -o make_hash_ink make_hash_ink.c
+ $(CC) $(CFLAGS) -lm $(LDFLAGS) -o make_hash_ink make_hash_ink.c
hash_ink.c: make_hash_ink
./make_hash_ink 4 3 > hash_ink.c
diff -up pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile
--- pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile.ldflags 2018-03-01 15:38:09.226582676 +0100
+++ pnm2ppa-1.04/pbm2ppa-0.8.6/Makefile 2018-03-01 15:53:22.016739424 +0100
@@ -1,6 +1,5 @@
CC=gcc
CFLAGS=$(RPM_OPT_FLAGS)
-LDFLAGS=
PRINTER=HP720
default: all
@@ -23,7 +22,7 @@ pbm2ppa: pbm2ppa.o ppa.o pbm.o cutswath.
$(CC) $(LDFLAGS) -o pbm2ppa pbm2ppa.o ppa.o pbm.o cutswath.o
pbmtpg: pbmtpg.o
- $(CC) $(CFLAGS) -o pbmtpg pbmtpg.o -lm
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pbmtpg pbmtpg.o -lm
.c.o: $*.c ppa.h pbm.h
$(CC) $(CFLAGS) -DDEFAULT_PRINTER=$(PRINTER) -c $*.c

14
pnm2ppa.spec
View File

@ -2,7 +2,7 @@ Name: pnm2ppa
Summary: Drivers for printing to HP PPA printers
Epoch: 1
Version: 1.04
Release: 37%{?dist}
Release: 38%{?dist}
URL: http://sourceforge.net/projects/pnm2ppa
Source: http://download.sourceforge.net/pnm2ppa/pnm2ppa-%{version}.tar.gz
# Following sourcelink is dead currently.
@ -13,6 +13,8 @@ Patch2: pbm2ppa-20000205.diff
Patch3: pnm2ppa-redhat.patch
# Don't return a local variable out of scope (bug #704568).
Patch4: pnm2ppa-coverity-return-local.patch
# add ldflags to Makefile
Patch5: pnm2ppa-ldflags.patch
License: GPLv2+ and GPLv2
# gcc is no longer in buildroot by default
@ -34,6 +36,7 @@ Install pnm2ppa if you need to print to a PPA printer.
%patch2 -p0 -b .20000205
%patch3 -p1 -b .rh
%patch4 -p1 -b .coverity-return-local
%patch5 -p1 -b .ldflags
for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
sed "s|\r||g" $file > $file.new && \
@ -42,9 +45,11 @@ for file in docs/en/LICENSE pbm2ppa-0.8.6/LICENSE; do
done
%build
make %{?_smp_mflags}
# set redhat build flags
%set_build_flags
%make_build
pushd pbm2ppa-0.8.6
make %{?_smp_mflags}
%make_build
popd
@ -87,6 +92,9 @@ done
%config(noreplace) %{_sysconfdir}/pbm2ppa.conf
%changelog
* Thu Mar 01 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-38
- 1548734 - pnm2ppa: Partial Fedora build flags injection
* Mon Feb 19 2018 Zdenek Dohnal <zdohnal@redhat.com> - 1:1.04-37
- gcc is no longer in buildroot by default