0a7d172130
- New rpm-plugin-audit sub-package - Rebase patches as necessary - Drop the evil python3 string monkey-patching - Drop no longer needed LUA_COMPAT defines and friends and use %set_build_flags instead. - python and perl macros and helper scripts are gone
16 lines
707 B
Diff
16 lines
707 B
Diff
diff -up rpm-4.9.1.1/macros.in.jx rpm-4.9.1.1/macros.in
|
|
--- rpm-4.9.1.1/macros.in.jx 2011-08-03 16:19:05.000000000 -0400
|
|
+++ rpm-4.9.1.1/macros.in 2011-08-08 09:41:52.981064316 -0400
|
|
@@ -674,9 +674,10 @@ print (t)\
|
|
RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
|
|
RPM_OPT_FLAGS=\"%{optflags}\"\
|
|
+ RPM_LD_FLAGS=\"%{?build_ldflags}\"\
|
|
RPM_ARCH=\"%{_arch}\"\
|
|
RPM_OS=\"%{_os}\"\
|
|
RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
|
|
- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
|
|
+ export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_LD_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
|
|
RPM_DOC_DIR=\"%{_docdir}\"\
|
|
export RPM_DOC_DIR\
|
|
RPM_PACKAGE_NAME=\"%{NAME}\"\
|