Skip to content

Commit

Permalink
do-rpm: set build flags to the rpm provided ones (instead of using de…
Browse files Browse the repository at this point in the history 
…v build flags)

Fixes codyps#11
  • Loading branch information
@codyps
codyps committed Mar 28, 2020
1 parent f2b9364 commit 3337adb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,8 @@ illum-ctl

# FIXME: remove once config.h is shoved in one of the build subdirs
config.h

/BUILD/
/RPMS/
/SRPMS/
/RPM_SOURCES/
2 changes: 1 addition & 1 deletion do-rpm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ gzip -9 RPM_SOURCES/ccan-"$ccan_ph".tar

sed -e s,%ver%,$pv,g -e s,%dist%,$dist,g -e s,%commit%,$ph,g -e s,%ccan_commit%,$ccan_ph,g < $pn.spec.in > RPM_SOURCES/$pn.spec

rpmbuild -D_topdir" $(pwd)" -D_sourcedir" $(pwd)"/RPM_SOURCES -D_specdir" $(pwd)"/RPM_SOURCES -ba RPM_SOURCES/"$pn".spec
rpmbuild --nodeps -D_topdir" $(pwd)" -D_sourcedir" $(pwd)"/RPM_SOURCES -D_specdir" $(pwd)"/RPM_SOURCES -ba RPM_SOURCES/"$pn".spec
3 changes: 2 additions & 1 deletion illum.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ rmdir ccan
mv $(basename %{SOURCE1} .tar.gz) ccan

%build
./build
%set_build_flags
./build -v

%install
rm -rf $RPM_BUILD_ROOT
Expand Down

0 comments on commit 3337adb

Please sign in to comment.