From: klakier <klakier@pld-linux.org>
Date: Tue, 15 May 2001 22:37:27 +0000 (+0000)
Subject: - linked -BOOT against uClibc
X-Git-Tag: dml-0_0_10-1~10
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdml.git;a=commitdiff_plain;h=7a75c3bc83267a5aab45392e9b8334c0fd0b47b2

- linked -BOOT against uClibc

Changed files:
    dml.spec -> 1.9
---

diff --git a/dml.spec b/dml.spec
index 59b1894..5028124 100644
--- a/dml.spec
+++ b/dml.spec
@@ -8,8 +8,8 @@ Group:		Applications/Terminal
 Group(de):	Applikationen/Terminal
 Group(pl):	Aplikacje/Terminal
 Source0:	ftp://ftp.pld.org.pl/people/malekith/%{name}-%{version}.tar.gz
-BuildRequires:	slang-static
-BuildRequires:	gettext-devel
+BuildRequires:	slang-devel-BOOT
+#BuildRequires:	gettext-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,16 +32,27 @@ Tool for displaying dialogs from shell. Bootdisk version.
 %setup -q
 
 %build
-#autoheader
+autoheader
 automake --add-missing
 autoconf 
 
-# --disable-nls does not really work - cannot compile against uClibc
 %configure --disable-nls
-%{__make} \
-	CFLAGS="-I%{_libdir}/bootdisk%{_includedir}" \
-	LDFLAGS="-nostdlib -s" \
-	LIBS="%{_libdir}/bootdisk%{_libdir}/crt0.o %{_libdir}/bootdisk%{_libdir}/libc.a -lgcc"
+
+# uClibc does not have two functions referenced in libslang
+# they are not critical for bootdisk, let's create some fake ones
+cat <<EOF >src/setsf.c
+int setfsuid (void *foo) { return 0; }
+int setfsgid (void *foo) { return 0; }
+EOF
+( cd src; gcc -c setsf.c; )
+
+%{__make} -C src \
+	CFLAGS="-I%{_libdir}/bootdisk%{_includedir} " \
+	LDFLAGS="-nostdlib -static -s" \
+	LDADD="setsf.o  \
+		%{_libdir}/bootdisk%{_libdir}/libslang.a \
+		%{_libdir}/bootdisk%{_libdir}/crt0.o \
+		%{_libdir}/bootdisk%{_libdir}/libc.a -lgcc "
 
 %install
 rm -rf $RPM_BUILD_ROOT