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

Merged update from upstream sources

Browse Source 
This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/fxload.git#6719e23cab82576db9394b449e3233860a79db81
This commit is contained in:
DistroBaker 2020-12-11 12:17:10 +01:00
parent dcca12fea6
commit d5742fcc6d
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fxload-cflags-ldflags.patch
View File

@ -1,12 +0,0 @@
diff -up fxload-2008_10_13/Makefile.cflags fxload-2008_10_13/Makefile
--- fxload-2008_10_13/Makefile.cflags 2008-10-13 17:44:04.000000000 -0400
+++ fxload-2008_10_13/Makefile 2018-02-25 23:11:02.416103160 -0500
@@ -39,7 +39,7 @@ release: rpms
# object files
$(PROG): $(FILES_OBJ)
- $(CC) -o $(PROG) $(FILES_OBJ)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(FILES_OBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $< -o $@

12
fxload-ldflags.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ruN fxload-2008_10_13.orig/Makefile fxload-2008_10_13/Makefile
--- fxload-2008_10_13.orig/Makefile 2008-10-13 23:44:04.000000000 +0200
+++ fxload-2008_10_13/Makefile 2020-11-03 16:05:41.516974652 +0100
@@ -39,7 +39,7 @@
# object files
$(PROG): $(FILES_OBJ)
- $(CC) -o $(PROG) $(FILES_OBJ)
+ $(CC) $(LDFLAGS) -o $(PROG) $(FILES_OBJ)
%.o: %.c
$(CC) -c $(CFLAGS) $< -o $@

11
fxload.spec
View File

@ -1,6 +1,6 @@
Name: fxload
Version: 2008_10_13
Release: 16%{?dist}
Release: 17%{?dist}
Summary: A helper program to download firmware into FX and FX2 EZ-USB devices
License: GPLv2+
@ -15,7 +15,7 @@ Source0: fxload-%{version}-noa3load.tar.gz
# ./fxload-generate-tarball.sh 2008_10_13
Source1: fxload-generate-tarball.sh
Patch0: fxload-noa3load.patch
Patch1: fxload-cflags-ldflags.patch
Patch1: fxload-ldflags.patch
BuildRequires: gcc kernel-headers
Requires: udev
@ -30,10 +30,10 @@ appears on the bus.
%prep
%setup -q
%patch0 -p1 -b .fxload-noa3load
%patch1 -p1 -b .cflags
%patch1 -p1 -b .ldflags
%build
make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie"
%install
mkdir -p -m 755 %{buildroot}/sbin
@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/
%{_mandir}/*/*
%changelog
* Tue Dec 08 2020 Charles R. Anderson <cra@alum.wpi.edu> - 2008_10_13-17
- Merge PR#2: Make annocheck pass, pass -pie to linker, use make_build macro
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2008_10_13-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild