[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MiNT] [PATCH] Removing 020/v4e suffixes + math-68881.h
Hi,
this is a small patch reflecting Vincent's changes / findings. I think we don't need this stuff anymore in mintlib.
--
MiKRO / Mystic Bytes
http://mikro.atari.org
Index: configvars
===================================================================
RCS file: /mint/mintlib/configvars,v
retrieving revision 1.22
diff -u -r1.22 configvars
--- configvars 22 Aug 2010 20:53:32 -0000 1.22
+++ configvars 9 Feb 2011 19:56:19 -0000
@@ -30,7 +30,7 @@
WITH_V4E_LIB=yes
# Uncomment this out if you want a debuggable lib lib_g.a.
-WITH_DEBUG_LIB=yes
+#WITH_DEBUG_LIB=yes
# Uncomment this out if you want a debugable lib lib_p.a.
# This is currently not recommended. At least on my machine
@@ -38,7 +38,7 @@
# cannot debug it because the debugger runs out of memory before
# it can fork (even for hello.c). It may be a memory problem
# that only occurs here, it may be a bug.
-WITH_PROFILE_LIB=yes
+#WITH_PROFILE_LIB=yes
# This variable is used for various others. Change its value if
# need be. When cross-compiling you will usually want to set this
Index: libinstall
===================================================================
RCS file: /mint/mintlib/libinstall,v
retrieving revision 1.4
diff -u -r1.4 libinstall
--- libinstall 29 May 2009 19:19:46 -0000 1.4
+++ libinstall 9 Feb 2011 19:56:19 -0000
@@ -280,41 +280,30 @@
for type in "" _p _g 020 v4e; do
case x$type in
x020)
- libsuffix=020
libinstdir=$libdir/m68020-60
libheredir=lib020
type=
;;
xv4e)
- libsuffix=v4e
libinstdir=$libdir/m5475
libheredir=libv4e
type=
;;
x_p|x_g)
- libsuffix=
libinstdir=$libdir
libheredir=lib$type
;;
*)
- libsuffix=
libinstdir=$libdir
libheredir=lib
;;
esac
for lib in c iio socket; do
- liblongname=lib$lib$libsuffix.a
libname=lib$lib$type.a
test -f $libheredir/$libname || continue
echo " $install -m 644 $libheredir/$libname $libinstdir"
$install -m 644 $libheredir/$libname $libinstdir || exit 1
- if test x$libsuffix != x; then
- echo " rm -f $libdir/$liblongname $libinstdir/$liblongname"
- rm -f $libdir/$liblongname $libinstdir/$liblongname
- echo " $ln_s $libname $libinstdir/$liblongname"
- $ln_s $libname $libinstdir/$liblongname
- fi
done
done
}
Index: mintlib.spec
===================================================================
RCS file: /mint/mintlib/mintlib.spec,v
retrieving revision 1.11
diff -u -r1.11 mintlib.spec
--- mintlib.spec 24 Jun 2010 08:53:18 -0000 1.11
+++ mintlib.spec 9 Feb 2011 19:56:19 -0000
@@ -572,17 +572,11 @@
%{_prefix}%{crossprefix}/lib/libiio.a
%{_prefix}%{crossprefix}/lib/librpcsvc.a
%{_prefix}%{crossprefix}/lib/m68020-60/libc.a
-%{_prefix}%{crossprefix}/lib/m68020-60/libc020.a
%{_prefix}%{crossprefix}/lib/m68020-60/libiio.a
-%{_prefix}%{crossprefix}/lib/m68020-60/libiio020.a
%{_prefix}%{crossprefix}/lib/m68020-60/librpcsvc.a
-%{_prefix}%{crossprefix}/lib/m68020-60/librpcsvc020.a
%{_prefix}%{crossprefix}/lib/m5475/libc.a
-%{_prefix}%{crossprefix}/lib/m5475/libcv4e.a
%{_prefix}%{crossprefix}/lib/m5475/libiio.a
-%{_prefix}%{crossprefix}/lib/m5475/libiiov4e.a
%{_prefix}%{crossprefix}/lib/m5475/librpcsvc.a
-%{_prefix}%{crossprefix}/lib/m5475/librpcsvcv4e.a
%files debug
%defattr(-,root,root)
Index: mintlib.spec.in
===================================================================
RCS file: /mint/mintlib/mintlib.spec.in,v
retrieving revision 1.10
diff -u -r1.10 mintlib.spec.in
--- mintlib.spec.in 24 Jun 2010 08:53:18 -0000 1.10
+++ mintlib.spec.in 9 Feb 2011 19:56:19 -0000
@@ -572,17 +572,11 @@
%{_prefix}%{crossprefix}/lib/libiio.a
%{_prefix}%{crossprefix}/lib/librpcsvc.a
%{_prefix}%{crossprefix}/lib/m68020-60/libc.a
-%{_prefix}%{crossprefix}/lib/m68020-60/libc020.a
%{_prefix}%{crossprefix}/lib/m68020-60/libiio.a
-%{_prefix}%{crossprefix}/lib/m68020-60/libiio020.a
%{_prefix}%{crossprefix}/lib/m68020-60/librpcsvc.a
-%{_prefix}%{crossprefix}/lib/m68020-60/librpcsvc020.a
%{_prefix}%{crossprefix}/lib/m5475/libc.a
-%{_prefix}%{crossprefix}/lib/m5475/libcv4e.a
%{_prefix}%{crossprefix}/lib/m5475/libiio.a
-%{_prefix}%{crossprefix}/lib/m5475/libiiov4e.a
%{_prefix}%{crossprefix}/lib/m5475/librpcsvc.a
-%{_prefix}%{crossprefix}/lib/m5475/librpcsvcv4e.a
%files debug
%defattr(-,root,root)
Index: rules
===================================================================
RCS file: /mint/mintlib/rules,v
retrieving revision 1.5
diff -u -r1.5 rules
--- rules 28 Feb 2008 18:30:08 -0000 1.5
+++ rules 9 Feb 2011 19:56:19 -0000
@@ -35,9 +35,7 @@
baselibs = $(basename $(LIBS))
-install-lib: install-lib-plain install-lib-links
-
-install-lib-plain:
+install-lib:
$(mkinstalldirs) $(libdir)/$(instdir)
@list='$(LIBS)'; for p in $$list; do \
if test -f $$p; then \
@@ -46,21 +44,6 @@
else :; fi; \
done
-ifdef instdir
-install-lib-links:
- $(mkinstalldirs) $(libdir)/$(instdir)
- @list='$(baselibs)'; for p in $$list; do \
- if test -f $(libdir)/$(instdir)/$$p.a; then \
- echo " rm -f $(libdir)/$(instdir)/"$$p"$(libsize).a $(libdir)/"$$p"$(libsize).a"; \
- rm -f $(libdir)/$(instdir)/"$$p"$(libsize).a $(libdir)/"$$p"$(libsize).a; \
- echo " ln -sf $$p.a $(libdir)/$(instdir)/"$$p"$(libsize).a"; \
- ln -sf $$p.a $(libdir)/$(instdir)/"$$p"$(libsize).a; \
- else :; fi; \
- done
-else
-install-lib-links:
-endif
-
uninstall-lib:
list='$(baselibs)'; for p in $$list; do \
r=$$p.a; \
Index: include/bits/EXTRAFILES
===================================================================
RCS file: /mint/mintlib/include/bits/EXTRAFILES,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 EXTRAFILES
--- include/bits/EXTRAFILES 12 Oct 2000 10:56:35 -0000 1.1.1.1
+++ include/bits/EXTRAFILES 9 Feb 2011 19:56:19 -0000
@@ -1,4 +1,6 @@
# This file gets included by the Makefile in this directory to determine
# the files that should go only into source distributions.
-SRCFILES += BINFILES EXTRAFILES Makefile SRCFILES
+SRCFILES += BINFILES EXTRAFILES Makefile SRCFILES \
+ \
+ math-68881.h
Index: include/bits/MISCFILES
===================================================================
RCS file: /mint/mintlib/include/bits/MISCFILES,v
retrieving revision 1.12
diff -u -r1.12 MISCFILES
--- include/bits/MISCFILES 24 Apr 2002 06:54:11 -0000 1.12
+++ include/bits/MISCFILES 9 Feb 2011 19:56:19 -0000
@@ -13,7 +13,6 @@
ipc.h \
libc-lock.h \
local_lim.h \
- math-68881.h \
mathdef.h \
mint_stdio.h \
msq.h \