- dropped pre-cvs changelog

[packages/ash.git] / ash.spec

diff --git a/ash.spec b/ash.spec
index 2130b642d29fbd1a50c30c1a8da7355acefb3bd7..d8e75f0178031b9a3dab7c2e2414c91c69f79b22 100644 (file)
--- a/ash.spec
+++ b/ash.spec
@@ -22,7 +22,7 @@ Summary(zh_CN.UTF-8): [系统]Berkeley的微型Bourne Shell
 Summary(zh_TW.UTF-8):  [\e-A系\e$)B統]Berkeley的\e-A微\e$)B型Bourne Shell
 Name:          ash
 Version:       0.4.0
-Release:       10
+Release:       11
 License:       BSD
 Group:         Applications/Shells
 Source0:       %{name}-%{version}.tar.gz
@@ -49,6 +49,7 @@ Patch18:      %{name}-ppid.patch
 Patch19:       %{name}-freebsd.patch
 Patch20:       %{name}-sighup.patch
 Patch21:       %{name}-dietlibc.patch
+Patch22:       %{name}-extern.patch
 BuildRequires: byacc
 %{?with_dietlibc:BuildRequires:        dietlibc-devel}
 BuildRequires: flex
@@ -174,16 +175,30 @@ avantajına sahiptir.
 %patch19 -p1
 %patch20 -p1
 %{?_with_dietlibc:%patch21 -p1}
+%patch22 -p1
 
 %build
+%if %{with static}
+%{__make} \
+%if %{with dietlibc}
+       CC="diet %{__cc}" \
+%else
+%if %{with uClibc}
+       CC="%{_target_cpu}-uclibc-gcc"\
+%else
+       CC="%{__cc}"
+%endif
+%endif
+       OPT_FLAGS="%{rpmcflags} -Os" \
+       LDFLAGS="-static %{rpmldflags}"
 
-%define __cc %{_target_cpu}-pld-linux-gcc
-%{?with_dietlibc:%define __cc %{_target_cpu}-dietlibc-gcc}
-%{?with_uClibc:%define __cc %{_target_cpu}-uclibc-gcc}
+mv -f sh ash.static
+%endif
 
-%{?with_static:%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="-static %{rpmldflags}" CC="%{__cc}"}
-%{?with_static:mv -f sh ash.static}
-%{__make} OPT_FLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}" CC="%{__cc}"
+%{__make} \
+       CC="%{__cc}" \
+       OPT_FLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT