diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-15 17:08:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-15 17:08:34 +0000 |
| commit | 9c02ebaf97fee994e5d48f32e79cb64fd1d62f84 (patch) | |
| tree | 1bc5013269fe6f79ee5ce9ad25bd4ed1cdda5f42 | |
| parent | eed474e18d83c3cbe5a25bf24eb94f792d2a31a4 (diff) | |
| download | rpm-setup-9c02ebaf97fee994e5d48f32e79cb64fd1d62f84.tar rpm-setup-9c02ebaf97fee994e5d48f32e79cb64fd1d62f84.tar.gz rpm-setup-9c02ebaf97fee994e5d48f32e79cb64fd1d62f84.tar.bz2 rpm-setup-9c02ebaf97fee994e5d48f32e79cb64fd1d62f84.tar.xz rpm-setup-9c02ebaf97fee994e5d48f32e79cb64fd1d62f84.zip | |
remove some more macros which are now in rpm-manbo-setup
| -rw-r--r-- | build.macros.in | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/build.macros.in b/build.macros.in index b3a863d..55c25b5 100644 --- a/build.macros.in +++ b/build.macros.in @@ -6,11 +6,6 @@ %defaultbuildroot %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%__cputoolize cputoolize - -# Where install-info is located -%__install_info /sbin/install-info - # Various programs used in rpm scripts %_update_desktop_database_bin %{_bindir}/update-desktop-database %_update_mime_database_bin %{_bindir}/update-mime-database @@ -28,8 +23,6 @@ # (e.g. per-platform, per-system, per-packager, per-package) macros. # -%debugcflags %{?_enable_debug_packages:-g} - %debug_package_and_restore %{debug_package} \ %package __restore__\ Summary: %{summary}\ @@ -40,13 +33,6 @@ Group: %{group}\ %sunsparc sun4 sun4m sun4c sun4d sparc sparcv8 sparcv9 sparc64 scparcv9b sparcv9v -# common compilation flags -%_fortify_cflags -Wp,-D_FORTIFY_SOURCE=2 -%_serverbuild_flags %nil -%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4 %{?_serverbuild_flags} -%__common_cflags -O2 %{debugcflags} -pipe %{?_fortify_cflags} -fexceptions -%__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags} - # Multilibs %_multilibpatt (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$ @@ -201,8 +187,6 @@ then %{_scrollkeeper_bin} -q || true ; fi \ # (Note: Above is the goal, below are the macros under development) # -%__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)} - %old_makeinstall \ make \\\ prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\ |