[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MiNT] mintlib rpm fix
Hi,
I tried to compile my own RPM of mintlib 0.59 (as there's no public release yet) and I found out a lot of things is broken for 0.59 when using files from CVS and old 2.95 gcc... I fixed this:
- for debug, 020, profile and v4e targets also DIST_SUBDIRS are affected (that means if 020 build is disabled, RPM will contain no 020 libs) -- this fixes problem with v4e when building on gcc 2.95 (there's no such target but RPM build requested it anyway)
- changed check for updated NEWS to ChangeLog file. I don't know if this is OK, if not, feel free to ignore this part, I just thought it make sense since NEWS is not updated since 0.55 and it breaks RPM / dist builds
- added / removed files from .cvsignore and xxxFILES, again, needed to correct dist and bin-dist targets
- removed #include <mint/trap.h> from syscall generator since this file no longer exists
I haven't time to test whole RPM generation but it make dist and make bin-dist are working well.
--
MiKRO / Mystic Bytes
http://mikro.atari.org
? 00PatchLevel
? mintlib-0.59.0
? mintlib-0.59.0.tar.gz
Index: Makefile
===================================================================
RCS file: /mint/mintlib/Makefile,v
retrieving revision 1.13
diff -c -u -u -r1.13 Makefile
--- Makefile 22 May 2009 18:29:06 -0000 1.13
+++ Makefile 19 Jan 2010 23:17:50 -0000
@@ -25,7 +25,7 @@
SUBDIRS = include syscall startup argp conf crypt dirent gmp login mintlib \
misc posix pwdgrp shadow signal socket stdiio stdio stdlib string sysvipc \
termios time unix lib sunrpc tz
-DIST_SUBDIRS = argp conf crypt dirent gmp include lib lib_g lib_p lib020 libv4e \
+DIST_SUBDIRS = argp conf crypt dirent gmp include lib \
login mintlib misc posix pwdgrp shadow signal socket startup \
stdiio stdio stdlib string sunrpc syscall sysvipc termios time tz unix
TEST_SUBDIRS = argp crypt dirent login mintlib misc posix pwdgrp shadow signal \
@@ -33,18 +33,22 @@
ifeq ($(WITH_PROFILE_LIB), yes)
SUBDIRS += lib_p
+ DIST_SUBDIRS += lib_p
endif
ifeq ($(WITH_DEBUG_LIB), yes)
SUBDIRS += lib_g
+ DIST_SUBDIRS += lib_g
endif
ifeq ($(WITH_020_LIB), yes)
SUBDIRS += lib020
+ DIST_SUBDIRS += lib020
endif
ifeq ($(WITH_V4E_LIB), yes)
SUBDIRS += libv4e
+ DIST_SUBDIRS += libv4e
endif
include $(srcdir)/BINFILES
@@ -103,8 +107,8 @@
-rm -rf $(distdir)
distdir: $(DISTFILES)
- @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
- echo "NEWS not updated; not releasing" 1>&2; \
+ @if sed 15q $(srcdir)/ChangeLog | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+ echo "ChangeLog not updated; not releasing" 1>&2; \
exit 1; \
fi
-rm -rf $(distdir)
@@ -131,8 +135,8 @@
-rm -rf $(bindistdir)
bindistdir: $(BINDISTFILES)
- @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \
- echo "NEWS not updated; not releasing" 1>&2; \
+ @if sed 15q $(srcdir)/ChangeLog | fgrep -e "$(VERSION)" > /dev/null; then :; else \
+ echo "ChangeLog not updated; not releasing" 1>&2; \
exit 1; \
fi
-rm -rf $(bindistdir)
Index: include/MISCFILES
===================================================================
RCS file: /mint/mintlib/include/MISCFILES,v
retrieving revision 1.17
diff -c -u -u -r1.17 MISCFILES
--- include/MISCFILES 28 Apr 2009 15:45:26 -0000 1.17
+++ include/MISCFILES 19 Jan 2010 23:17:51 -0000
@@ -42,6 +42,7 @@
locale.h \
macros.h \
malloc.h \
+ math.h \
memory.h \
minimal.h \
mintbind.h \
Index: include/mint/.cvsignore
===================================================================
RCS file: /mint/mintlib/include/mint/.cvsignore,v
retrieving revision 1.2
diff -c -u -u -r1.2 .cvsignore
--- include/mint/.cvsignore 12 Mar 2002 16:21:14 -0000 1.2
+++ include/mint/.cvsignore 19 Jan 2010 23:17:51 -0000
@@ -1,3 +1,5 @@
*~
sysbind.h
-trap.h
+trap1.h
+trap13.h
+trap14.h
Index: include/mint/MISCFILES
===================================================================
RCS file: /mint/mintlib/include/mint/MISCFILES,v
retrieving revision 1.11
diff -c -u -u -r1.11 MISCFILES
--- include/mint/MISCFILES 25 Nov 2008 14:22:34 -0000 1.11
+++ include/mint/MISCFILES 19 Jan 2010 23:17:51 -0000
@@ -27,5 +27,7 @@
sysbind.h \
sysctl.h \
sysvars.h \
- trap.h \
+ trap1.h \
+ trap13.h \
+ trap14.h \
xbra.h
Index: syscall/EXTRAFILES
===================================================================
RCS file: /mint/mintlib/syscall/EXTRAFILES,v
retrieving revision 1.2
diff -c -u -u -r1.2 EXTRAFILES
--- syscall/EXTRAFILES 3 Jun 2002 12:50:53 -0000 1.2
+++ syscall/EXTRAFILES 19 Jan 2010 23:17:51 -0000
@@ -2,7 +2,6 @@
# the files that should go only into source distributions.
SRCFILES += BINFILES EXTRAFILES Makefile MISCFILES SRCFILES \
-check.c check.h generate.c generate.h list.c list.h main.c main.h \
+check.c check.h generate.c generate.h main.c \
pars.y scan.l pars.h traps.c traps.h \
-syscalls.master
-
+syscallparser.c syscallparser.h syscalldefs.h syscalls.master
Index: syscall/traps.c
===================================================================
RCS file: /mint/mintlib/syscall/traps.c,v
retrieving revision 1.8
diff -c -u -u -r1.8 traps.c
--- syscall/traps.c 27 May 2009 22:27:54 -0000 1.8
+++ syscall/traps.c 19 Jan 2010 23:17:51 -0000
@@ -302,7 +302,6 @@
}
print_head(f, "gen-syscall");
- fprintf(f, "#include <mint/trap.h>\n");
fprintf(f, "#include <compiler.h>\n");
fprintf(f, "\n");