- 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

Changed files:
    Dev86src-opt.patch -> 1.4
    bcc.spec -> 1.38
    dev86-0.16.17-make382.patch -> 1.2
    dev86-make.patch -> 1.1

diff --git a/Dev86src-opt.patch b/Dev86src-opt.patch
index c5945b38d9be065904db0d0e3d53a9150f2bc759..34e9e10c943d9efe968bb6bf94ba1d97b098e9c3 100644 (file)
--- a/Dev86src-opt.patch
+++ b/Dev86src-opt.patch
@@ -10,17 +10,17 @@ diff -Nur dev86-0.16.0.orig/libbsd/Make.defs dev86-0.16.0/libbsd/Make.defs
  WALL= -ansi -pedantic -Wwrite-strings -Wpointer-arith -Wcast-qual \
        -Wcast-align -Wtraditional -Wstrict-prototypes -Wmissing-prototypes \
        -Wnested-externs -Winline -Wshadow
  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)
  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 ...
  
  # 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 @@
 --- 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 @@

diff --git a/bcc.spec b/bcc.spec
index c4a6172c54751842712a64d361f52dd55ee0364f..d094a9708d44c30a8bd89922382d71b386091249 100644 (file)
--- a/bcc.spec
+++ b/bcc.spec
@@ -1,29 +1,29 @@
 Summary:       Bruce's C compiler
 Summary(pl.UTF-8):     Kompilator C Bruce'a
 Name:          bcc
 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
 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
 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
 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
 
 %description
 Bcc is a simple C compiler that produces 8086 assembler, in addition


@@ -43,11 +43,13 @@ są odwzorowywane do jednego z innych typów całkowitych.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0

-%patch4 -p0
-%ifarch %{x8664}
+%if "%{_lib}" == "lib64"
+%patch4 -p1
+%endif
+%ifnarch %{ix86}

 %patch5 -p1
 %patch5 -p1

-%patch6 -p1

 %endif
 %endif

+%patch6 -p1

 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1


@@ -73,10 +75,8 @@ rm -rf $RPM_BUILD_ROOT
        DIST=$RPM_BUILD_ROOT \
        LIBDIR=%{_libdir}/bcc \
        INCLDIR=%{_libdir}/bcc \
        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
 
 
 cp -R libc/kinclude $RPM_BUILD_ROOT%{_libdir}/bcc
 


@@ -85,17 +85,11 @@ ln -sf objdump86 $RPM_BUILD_ROOT%{_bindir}/size86
 
 # these are separated in bin86 package
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{as86,ld86}
 
 # 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}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{as,ld}86.1*

 
 

-%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}}
+%ifnarch %{ix86}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/elks*.1

 %endif
 %endif

-%{!?debug:strip -R .comment -R .note $RPM_BUILD_ROOT%{_libdir}/bcc/{bcc*,copt,unproto}}

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT


@@ -106,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ar86
 %attr(755,root,root) %{_bindir}/bcc
 %attr(755,root,root) %{_bindir}/dis86
 %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
 %attr(755,root,root) %{_bindir}/elksemu
 %endif
 %attr(755,root,root) %{_bindir}/makeboot


@@ -125,4 +119,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/bcc/crt*.o
 %{_libdir}/bcc/lib*.a
 %{_libdir}/bcc/rules.*
 %{_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

diff --git a/dev86-0.16.17-make382.patch b/dev86-0.16.17-make382.patch
deleted file mode 100644 (file)
index e7ce065..0000000
--- a/dev86-0.16.17-make382.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libc/i386sys/Makefile
-+++ libc/i386sys/Makefile
-@@ -12,7 +12,7 @@
- DOBJ=opendir.o closedir.o readdir.o
- 
- ifeq ($(LIB_CPU)-$(LIB_OS),i386-ELKS)
--OBJ=$(LOBJ3) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o
-+OBJ=$(LOBJ) $(LOBJ) $(EOBJ) $(DOBJ) setjmp3.o
- SYSCALLS=syscalls
- 
- CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)

diff --git a/dev86-make.patch b/dev86-make.patch
new file mode 100644 (file)
index 0000000..b211068
--- /dev/null
+++ b/dev86-make.patch
@@ -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
+