Author: qboosh Date: Thu Apr 5 15:34:15 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- new URLs, updated to 0.16.18
- updated opt patch, removed obsolete make382 patch
- added make patch to adjust dis86 Makefile (add MANDIR support, kill stripping)
- use _noautostrip for individual files instead of disabling autostripping
globally
---- Files affected:
packages/bcc:
Dev86src-opt.patch (1.3 -> 1.4) , bcc.spec (1.37 -> 1.38) , dev86-make.patch
(NONE -> 1.1) (NEW), dev86-0.16.17-make382.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/bcc/Dev86src-opt.patch
diff -u packages/bcc/Dev86src-opt.patch:1.3 packages/bcc/Dev86src-opt.patch:1.4
--- packages/bcc/Dev86src-opt.patch:1.3 Tue Jan 27 23:03:37 2004
+++ packages/bcc/Dev86src-opt.patch Thu Apr 5 17:34:10 2012
@@ -10,17 +10,17 @@
WALL= -ansi -pedantic -Wwrite-strings -Wpointer-arith -Wcast-qual \
-Wcast-align -Wtraditional -Wstrict-prototypes -Wmissing-prototypes \
-Wnested-externs -Winline -Wshadow
---- dev86-0.16.15/Makefile.orig Tue Aug 27 21:54:49 2002
-+++ dev86-0.16.15/Makefile Tue Aug 27 21:57:17 2002
-@@ -16,7 +16,7 @@
+--- dev86-0.16.18/Makefile.orig 2010-10-23 17:31:44.000000000 +0200
++++ dev86-0.16.18/Makefile 2012-04-05 16:04:39.032535007 +0200
+@@ -18,7 +18,7 @@
INCLDIR= $(PREFIX)/lib/bcc
ASLDDIR= $(BINDIR)
MANDIR= $(PREFIX)/man
-CFLAGS= -O
+CFLAGS= $(OPT)
+ IFDEFNAME= ifdef
# Some makes take the last of a list as the default ...
- all: make.fil
--- dev86-0.16.8/makefile.in.orig Tue Aug 27 21:57:45 2002
+++ dev86-0.16.8/makefile.in Tue Aug 27 22:00:41 2002
@@ -40,7 +40,7 @@
================================================================
Index: packages/bcc/bcc.spec
diff -u packages/bcc/bcc.spec:1.37 packages/bcc/bcc.spec:1.38
--- packages/bcc/bcc.spec:1.37 Wed Feb 29 14:20:37 2012
+++ packages/bcc/bcc.spec Thu Apr 5 17:34:10 2012
@@ -2,29 +2,29 @@
Summary: Bruce's C compiler
Summary(pl.UTF-8): Kompilator C Bruce'a
Name: bcc
-Version: 0.16.17
-Release: 6
+Version: 0.16.18
+Release: 1
License: GPL
Group: Development/Languages
-Source0:
http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-%{version}.tar.gz
-# Source0-md5: e7bbfdbe61c2fb964994a087e29b0087
+Source0: http://www.debath.co.uk/dev86/Dev86src-%{version}.tar.gz
+# Source0-md5: f2e06b547397383b2b2650b9c4fd9bab
Patch0: Dev86src-noroot.patch
Patch1: Dev86src-opt.patch
Patch2: dev86-0.16.17-fortify.patch
Patch3: dev86-pic.patch
-Patch4: dev86-0.16.17-make382.patch
-Patch5: dev86-64bit.patch
-Patch6: dev86-noelks.patch
-Patch7: dev86-long.patch
-Patch8: dev86-nostrip.patch
-Patch9: dev86-print-overflow.patch
-URL: http://homepage.ntlworld.com/robert.debath/
-Requires: bin86
+Patch4: dev86-64bit.patch
+Patch5: dev86-noelks.patch
+Patch6: dev86-long.patch
+Patch7: dev86-nostrip.patch
+Patch8: dev86-print-overflow.patch
+Patch9: dev86-make.patch
+URL: http://www.debath.co.uk/
+Requires: bin86 >= %{version}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# don't try to strip Linux-8086 objects
-# TODO: use _noautostrip
-%define no_install_post_strip 1
+%define _noautostrip .*%{_libdir}/bcc/.*\\.[ao]
+
%description
Bcc is a simple C compiler that produces 8086 assembler, in addition
@@ -44,11 +44,13 @@
%patch1 -p1
%patch2 -p1
%patch3 -p0
-%patch4 -p0
-%ifarch %{x8664}
+%if "%{_lib}" == "lib64"
+%patch4 -p1
+%endif
+%ifnarch %{ix86}
%patch5 -p1
-%patch6 -p1
%endif
+%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -74,10 +76,8 @@
DIST=$RPM_BUILD_ROOT \
LIBDIR=%{_libdir}/bcc \
INCLDIR=%{_libdir}/bcc \
- LOCALPREFIX=%{_prefix}
-
-# FFU (dis88/Makefile is not ready)
-# MANDIR=%{_mandir}
+ LOCALPREFIX=%{_prefix} \
+ MANDIR=%{_mandir}
cp -R libc/kinclude $RPM_BUILD_ROOT%{_libdir}/bcc
@@ -86,17 +86,11 @@
# these are separated in bin86 package
%{__rm} $RPM_BUILD_ROOT%{_bindir}/{as86,ld86}
-%{__rm} $RPM_BUILD_ROOT/usr/man/man1/{as,ld}86.1*
-# move man pages where they belong
-install -d $RPM_BUILD_ROOT%{_mandir}
-mv -f $RPM_BUILD_ROOT/usr/man/* $RPM_BUILD_ROOT%{_mandir}
-
-%ifnarch %{x8664}
-%{!?debug:strip -R .comment -R .note
$RPM_BUILD_ROOT%{_bindir}/{ar86,bcc,elksemu,objdump86}}
-%else
-%{!?debug:strip -R .comment -R .note
$RPM_BUILD_ROOT%{_bindir}/{ar86,bcc,objdump86}}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{as,ld}86.1*
+
+%ifnarch %{ix86}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/elks*.1
%endif
-%{!?debug:strip -R .comment -R .note
$RPM_BUILD_ROOT%{_libdir}/bcc/{bcc*,copt,unproto}}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -107,7 +101,7 @@
%attr(755,root,root) %{_bindir}/ar86
%attr(755,root,root) %{_bindir}/bcc
%attr(755,root,root) %{_bindir}/dis86
-%ifnarch %{x8664}
+%ifarch %{ix86}
%attr(755,root,root) %{_bindir}/elksemu
%endif
%attr(755,root,root) %{_bindir}/makeboot
@@ -126,7 +120,12 @@
%{_libdir}/bcc/crt*.o
%{_libdir}/bcc/lib*.a
%{_libdir}/bcc/rules.*
-%{_mandir}/man1/*
+%{_mandir}/man1/bcc.1*
+%{_mandir}/man1/dis86.1*
+%ifarch %{ix86}
+%{_mandir}/man1/elks.1*
+%{_mandir}/man1/elksemu.1*
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -134,6 +133,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.38 2012/04/05 15:34:10 qboosh
+- new URLs, updated to 0.16.18
+- updated opt patch, removed obsolete make382 patch
+- added make patch to adjust dis86 Makefile (add MANDIR support, kill
stripping)
+- use _noautostrip for individual files instead of disabling autostripping
globally
+
Revision 1.37 2012/02/29 13:20:37 baggins
- rel 6
- build on x8664
================================================================
Index: packages/bcc/dev86-make.patch
diff -u /dev/null packages/bcc/dev86-make.patch:1.1
--- /dev/null Thu Apr 5 17:34:16 2012
+++ packages/bcc/dev86-make.patch Thu Apr 5 17:34:10 2012
@@ -0,0 +1,21 @@
+--- dev86-0.16.18/dis88/Makefile.orig 2012-04-05 16:11:40.089215036 +0200
++++ dev86-0.16.18/dis88/Makefile 2012-04-05 16:33:25.792595180 +0200
+@@ -28,6 +28,7 @@
+ CFLAGS=$(OPT)
+ LDFLAGS=
+ PREFIX=/usr
++MANDIR=$(PREFIX)/man
+
+ OBJ = disrel.o dismain.o distabs.o dishand.o disfp.o
+
+@@ -37,8 +38,8 @@
+ $(CC) $(LDFLAGS) -o dis88 $(OBJ)
+
+ install: dis88
+- install -m 755 -s dis88 $(DIST)$(PREFIX)/bin/dis86
+- install -m 644 dis88.1 $(DIST)$(PREFIX)/man/man1/dis86.1
++ install -m 755 dis88 $(DIST)$(PREFIX)/bin/dis86
++ install -m 644 dis88.1 $(DIST)$(MANDIR)/man1/dis86.1
+
+ $(OBJ): dis.h a.out.h
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/bcc/Dev86src-opt.patch?r1=1.3&r2=1.4
http://cvs.pld-linux.org/packages/bcc/bcc.spec?r1=1.37&r2=1.38
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
