OBS User unknown 2008-02-25 16:00:30 +00:00 committed by Git OBS Bridge
parent 83de8c4a12
commit 06e7b5cb8a
5 changed files with 109 additions and 38 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 21 21:53:06 CET 2008 - bk@suse.de
- support native build on x86_64: no need for glibc-32bit on x86_64
- don't build elks (not happy on x86_64, from fc: no elks since fc7)
-------------------------------------------------------------------
Thu Nov 22 18:05:43 CET 2007 - ro@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package bin86 (Version 0.16.17)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -10,17 +10,24 @@
# norootforbuild
Name: bin86
ExclusiveArch: %ix86 x86_64
License: GPL v2 or later
Group: Development/Languages/Other
AutoReqProv: on
Version: 0.16.17
Release: 43
Release: 59
Summary: An 8086 Assembler and Linker
Url: http://www.cix.co.uk/~mayday/
Source: Dev86src-%{version}.tar.bz2
Source1: rpmlintrc
Patch: dev86-%{version}.dif
Patch2: dev86-noelks.patch
Patch3: dev86-x86_64.patch
%if 0%suse_version > 1020
BuildRequires: fdupes
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -56,24 +63,32 @@ Authors:
%prep
%setup -n dev86-%{version}
%patch
%patch2 -p1 -b .noelks
%ifarch x86_64
%patch3 -p1 -b .x86_64
%endif
%build
make GCCFLAG="$RPM_OPT_FLAGS -fno-strict-aliasing"
%install
rm -rf $RPM_BUILD_ROOT
make install DIST=$RPM_BUILD_ROOT PREFIX=/usr MANDIR=/usr/share/man
make install DIST=$RPM_BUILD_ROOT PREFIX=/usr MANDIR=/usr/share/man \
LIBDIR=%_libdir/bcc \
INCLDIR=%_libdir/bcc
make other
make install-other DIST=$RPM_BUILD_ROOT MANDIR=/usr/share/man
mv bootblocks/README bootblocks/README.bootblocks
mv copt/README copt/README.copt
mv dis88/README dis88/README.dis88
mv elksemu/README elksemu/README.elksemu
mv unproto/README unproto/README.unproto
mv bin86/README bin86/README.bin86
mkdir $RPM_BUILD_ROOT/usr/lib/bcc/kinclude
cp -a libc/kinclude/arch $RPM_BUILD_ROOT/usr/lib/bcc/kinclude
cp -a libc/kinclude/linuxmt $RPM_BUILD_ROOT/usr/lib/bcc/kinclude
mkdir $RPM_BUILD_ROOT/%_libdir/bcc/kinclude
cp -a libc/kinclude/arch $RPM_BUILD_ROOT/%_libdir/bcc/kinclude
cp -a libc/kinclude/linuxmt $RPM_BUILD_ROOT/%_libdir/bcc/kinclude
%if 0%suse_version > 1020
%fdupes %buildroot
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -93,27 +108,29 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc MAGIC Contributors bootblocks/README.bootblocks copt/README.copt
%doc dis88/README.dis88
%doc elksemu/README.elksemu unproto/README.unproto bin86/README-0.4
%doc unproto/README.unproto bin86/README-0.4
%doc bin86/README.bin86 bin86/ChangeLog
/usr/bin/elksemu
/usr/bin/ar86
/usr/bin/bcc
/usr/bin/dis86
/usr/bin/makeboot
/usr/lib/bcc
%_libdir/bcc
%doc /usr/share/man/man1/bcc.1.gz
%doc /usr/share/man/man1/dis86.1.gz
%doc /usr/share/man/man1/elks.1.gz
%doc /usr/share/man/man1/elksemu.1.gz
%exclude /usr/share/man/man1/elks.1.gz
%exclude /usr/share/man/man1/elksemu.1.gz
%changelog
* Thu Nov 22 2007 - ro@suse.de
* Thu Feb 21 2008 bk@suse.de
- support native build on x86_64: no need for glibc-32bit on x86_64
- don't build elks (not happy on x86_64, from fc: no elks since fc7)
* Thu Nov 22 2007 ro@suse.de
- updated rpmlintrc
* Tue Oct 02 2007 - matz@suse.de
* Tue Oct 02 2007 matz@suse.de
- Fix compile problem for GCC 4.3, and a harmless array access beyound bounds.
* Sat May 26 2007 - ro@suse.de
* Sun May 27 2007 ro@suse.de
- rpmlintrc: dev86 is a devel package, accept devel files there
* Sun Jan 21 2007 - ro@suse.de
* Sun Jan 21 2007 ro@suse.de
- update to 0.16.17 (thanks to rschiele)
- Sorry forgot to flip this back: perror and strerror are back to using
the /lib/liberror.txt file for all 8086 Elks modes. Only i386 has the
@ -207,50 +224,50 @@ rm -rf $RPM_BUILD_ROOT
DOS.
- Compile for DOS again, disable cpm86 headers under DOS.
- Minor bugfix for as86 binary output re sizeof(int)/K&R problem.
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Sep 22 2005 - ro@suse.de
* Thu Sep 22 2005 ro@suse.de
- fix implicit warnings
- do not strip during make install
* Sat Jul 16 2005 - meissner@suse.de
* Sat Jul 16 2005 meissner@suse.de
- fixed size of buffer passed to realpath.
* Wed Jan 19 2005 - ro@suse.de
* Wed Jan 19 2005 ro@suse.de
- fixed more compiler warnings
* Tue Feb 03 2004 - kukuk@suse.de
* Tue Feb 03 2004 kukuk@suse.de
- Fix compiler warnings
* Mon Oct 20 2003 - ro@suse.de
* Mon Oct 20 2003 ro@suse.de
- use defattr
- don't build as root
* Wed Jun 18 2003 - ro@suse.de
* Wed Jun 18 2003 ro@suse.de
- move buildroot entry to top in specfile
* Fri Jun 06 2003 - ro@suse.de
* Fri Jun 06 2003 ro@suse.de
- pack include files
* Thu Jan 23 2003 - ro@suse.de
* Thu Jan 23 2003 ro@suse.de
- downgrade to 0.16.0 since author claims 0.16.10 to be unstable
- use buildroot
* Mon Dec 16 2002 - ro@suse.de
* Mon Dec 16 2002 ro@suse.de
- update to 0.16.10
- bzip source, add URL to specfile
* Sun Dec 01 2002 - ro@suse.de
* Mon Dec 02 2002 ro@suse.de
- sys_errlist is deprecated, patch ar.c
* Tue Sep 17 2002 - ro@suse.de
* Tue Sep 17 2002 ro@suse.de
- removed bogus self-provides
* Sat Aug 24 2002 - ro@suse.de
* Sat Aug 24 2002 ro@suse.de
- fix doc section for new cp behaviour
* Mon Sep 25 2000 - ro@suse.de
* Mon Sep 25 2000 ro@suse.de
- sorted
* Wed Feb 09 2000 - ro@suse.de
* Wed Feb 09 2000 ro@suse.de
- fixed prefix-path for bcc
* Mon Jan 17 2000 - ro@suse.de
* Mon Jan 17 2000 ro@suse.de
- man to /usr/share/man
* Tue Dec 14 1999 - ro@suse.de
* Tue Dec 14 1999 ro@suse.de
- build from full-source Dev86-0.14.9
- added subpackage dev86 containing elksemu and bcc
* Mon Sep 13 1999 - bs@suse.de
* Mon Sep 13 1999 bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Sun Sep 05 1999 - ro@suse.de
* Mon Sep 06 1999 ro@suse.de
- updated to 0.14.9 with current src and manpages
* Thu Sep 10 1998 - ro@suse.de
* Thu Sep 10 1998 ro@suse.de
- don't redeclare malloc for glibc
* Wed Apr 30 1997 - florian@suse.de
* Wed Apr 30 1997 florian@suse.de
- update to version 0.4

View File

@ -5,7 +5,7 @@
ASLDDIR= $(BINDIR)
MANDIR= $(PREFIX)/man
-CFLAGS= -O
+CFLAGS= -O2 -march=i486 -fno-strength-reduce
+CFLAGS= -O2 -fno-strength-reduce
# Some makes take the last of a list as the default ...
all: make.fil

21
dev86-noelks.patch Normal file
View File

@ -0,0 +1,21 @@
Patch orginially appeared in fc7:
* Wed Jan 25 2006 Jeremy Katz <katzj@redhat.com> - 0.16.17-2
- build on x86_64
- don't build elks (it's not happy on x86_64)
--- dev86-0.16.17/makefile.in
+++ dev86-0.16.17/makefile.in
@@ -89,10 +89,10 @@
#ifdef GNUMAKE
all: check_config bcc86 cpp unproto copt as86 ar86 ld86 objdump86 \
- library lib-bsd alt-libs elksemu
+ library lib-bsd alt-libs
install: check_config install-bcc install-man \
- install-lib install-emu
+ install-lib
install-all: install install-other

27
dev86-x86_64.patch Normal file
View File

@ -0,0 +1,27 @@
From fc7+ rpms:
* Wed Dec 27 2006 Jindrich Novy <jnovy@redhat.com> - 0.16.17-4
- bcc now searches in correct path for bcc-cpp on x86_64 (#219697)
MAY ONLY BE APPLIED in %ifarch x86_64!!!
--- dev86-0.16.17/bcc/bcc.c.fix 2005-01-03 23:41:55.000000000 +0100
+++ dev86-0.16.17/bcc/bcc.c 2006-12-27 16:32:57.000000000 +0100
@@ -226,12 +226,12 @@
} else {
/* Relative paths to normal PREFIX directory */
- default_include = build_libpath("-I", "/lib/bcc/include", "");
- default_libdir = build_libpath("-L", "/lib/bcc", libdir_suffix);
- optim_rules = build_libpath("-d", "/lib/bcc", libdir_suffix);
+ default_include = build_libpath("-I", "/lib64/bcc/include", "");
+ default_libdir = build_libpath("-L", "/lib64/bcc", libdir_suffix);
+ optim_rules = build_libpath("-d", "/lib64/bcc", libdir_suffix);
- build_prefix("/lib/bcc", libdir_suffix, "");
- build_prefix("/lib/bcc", "", "");
+ build_prefix("/lib64/bcc", libdir_suffix, "");
+ build_prefix("/lib64/bcc", "", "");
}
build_prefix("/bin", "", "");