]>
Commit | Line | Data |
---|---|---|
a5a68e9c | 1 | diff -urN rpm-4.5/macros.in rpm-4.5.new//macros.in |
2 | --- rpm-4.5/macros.in 2010-05-28 20:56:02.854032755 +0200 | |
3 | +++ rpm-4.5.new//macros.in 2010-05-28 20:59:04.177348180 +0200 | |
4 | @@ -277,6 +277,9 @@ | |
5 | # | |
6 | #%distribution | |
7 | ||
8 | +# PLD Linux Release | |
9 | +%pld_release th | |
10 | + | |
11 | # Configurable distribution URL, same as DistURL: tag in a specfile. | |
12 | # The URL will be used to supply reliable information to tools like | |
13 | # rpmfind. | |
14 | @@ -1449,7 +1452,7 @@ | |
15 | # Note: Used iff _use_internal_dependency_generator is non-zero. The | |
16 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. | |
17 | %__libtool_provides %{_rpmhome}/libtooldeps.sh --provides %{buildroot} %{name} | |
18 | -%__libtool_requires %{_rpmhome}/libtooldeps.sh --requires %{buildroot} %{name} | |
19 | +%__libtool_requires %{nil} | |
20 | ||
21 | #------------------------------------------------------------------------ | |
22 | # pkgconfig(...) configuration. | |
23 | @@ -1459,7 +1462,7 @@ | |
24 | # Note: Used iff _use_internal_dependency_generator is non-zero. The | |
25 | # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. | |
26 | %__pkgconfig_provides %{_rpmhome}/pkgconfigdeps.sh --provides | |
27 | -%__pkgconfig_requires %{_rpmhome}/pkgconfigdeps.sh --requires | |
28 | +%__pkgconfig_requires %{nil} | |
29 | ||
30 | #------------------------------------------------------------------------ | |
31 | # executable(...) configuration. | |
32 | @@ -1482,6 +1485,9 @@ | |
33 | # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. | |
34 | ||
35 | %debugcflags -O0 -g -Wall | |
36 | +%debugcppflags %{nil} | |
cb048e05 | 37 | +%optldflags -Wl,--as-needed -Wl,--no-copy-dt-needed-entries -Wl,-z,relro -Wl,-z,combreloc |
a5a68e9c | 38 | +%optcppflags -D_FORTIFY_SOURCE=2 |
39 | ||
40 | # Warning: those macros are overwritten by macros.build, | |
41 | # left here for compatibility |