Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
ksh
workaround-stupid-build-system.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File workaround-stupid-build-system.diff of Package ksh
--- src/cmd/INIT/Mamfile +++ src/cmd/INIT/Mamfile 2008-02-14 12:08:37.000000000 +0000 @@ -5,7 +5,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS setv ARFLAGS -cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -27,7 +27,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc --- src/cmd/INIT/iffe.sh +++ src/cmd/INIT/iffe.sh 2008-02-14 12:15:59.000000000 +0000 @@ -1083,7 +1083,7 @@ case `(getopts '[-][123:xyz]' opt --xyz; --*) echo $command: $1: unknown option >&2 exit 2 ;; - -*) REM=`echo X$1 | sed 's,X-,,'` + -*) REM=`echo -$1 | sed 's,^--,,'` ;; *) break ;; --- src/cmd/INIT/mamake.c +++ src/cmd/INIT/mamake.c 2008-02-14 12:08:37.000000000 +0000 @@ -118,7 +118,7 @@ USAGE_LICENSE #define set(b,o) ((b)->nxt=(b)->buf+(o)) #define use(b) (*(b)->nxt=0,(b)->nxt=(b)->buf) -#define CHUNK 1024 +#define CHUNK 2048 #define KEY(a,b,c,d) ((((unsigned long)(a))<<15)|(((unsigned long)(b))<<10)|(((unsigned long)(c))<<5)|(((unsigned long)(d)))) #define NOW ((unsigned long)time((time_t*)0)) #define ROTATE(p,l,r,t) ((t)=(p)->l,(p)->l=(t)->r,(t)->r=(p),(p)=(t)) @@ -336,14 +336,14 @@ report(int level, char* text, char* item */ static void -dont(Rule_t* r, int code, int keepgoing) +dont(Rule_t* r, int code, int keepgoing, int line) { identify(stderr); if (!code) fprintf(stderr, "don't know how to make %s\n", r->name); else { - fprintf(stderr, "*** exit code %d making %s%s\n", code, r->name, state.ignore ? " ignored" : ""); + fprintf(stderr, "*** exit code %d making %s%s at line %d\n", code, r->name, state.ignore ? " ignored" : "", line); unlink(r->name); if (state.ignore) return; @@ -1257,7 +1257,7 @@ run(Rule_t* r, register char* s) if (x) { if (c = execute(s)) - dont(r, c, state.keepgoing); + dont(r, c, state.keepgoing, __LINE__); if (status((Buf_t*)0, 0, r->name, &st)) { r->time = st.st_mtime; @@ -1623,7 +1623,7 @@ make(Rule_t* r) } r->flags |= RULE_made; if (!(r->flags & (RULE_dontcare|RULE_error|RULE_exists|RULE_generated|RULE_implicit|RULE_virtual))) - dont(r, 0, state.keepgoing); + dont(r, 0, state.keepgoing, __LINE__); break; case KEY('e','x','e','c'): r->flags |= RULE_generated; @@ -1709,7 +1709,7 @@ verify(Dict_item_t* item, void* handle) Rule_t* r = (Rule_t*)item->value; if ((r->flags & (RULE_active|RULE_error|RULE_made)) == RULE_active) - dont(r, 0, 1); + dont(r, 0, 1, __LINE__); return 0; } --- src/cmd/ksh93/Mamfile +++ src/cmd/ksh93/Mamfile 2008-09-11 14:45:18.000000000 +0000 @@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS setv ARFLAGS -cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -29,7 +29,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc @@ -1394,7 +1394,7 @@ prev +ljobs prev +li prev ${mam_libsocket} prev ${mam_libsecdb} -exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libast} +exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libnsl} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} done ksh generated make shcomp make shcomp.o @@ -1418,7 +1418,7 @@ prev ${mam_libsocket} prev ${mam_libsecdb} setv CC.DLL -UCC.DLL setv SH_DICT -DSH_DICT="\"libshell\"" -exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libast} +exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o shcomp shcomp.o ${mam_libshell} ${mam_libnsl} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libast} done shcomp generated make suid_exec make suid_exec.o --- src/lib/libast/Mamfile +++ src/lib/libast/Mamfile 2008-02-14 12:08:37.000000000 +0000 @@ -5,7 +5,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS setv ARFLAGS -cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS ${mam_cc_DLL} -D_BLD_ast setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -27,7 +27,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc @@ -954,7 +954,7 @@ make lcgen make port/lcgen.c prev std/stdio.h implicit done port/lcgen.c -exec - ${CC} -o lcgen port/lcgen.c +exec - ${CC} ${mam_cc_FLAGS} -o lcgen port/lcgen.c done lcgen generated make port/lc.tab done port/lc.tab @@ -7131,64 +7131,37 @@ done ${INSTALLROOT}/lib/file/magic gener make ${INSTALLROOT}/include/ast/fmtmsg.h prev comp/fmtmsg.h prev ast_lib.h -exec - case ${mam_cc_HOSTTYPE} in -exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x -exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x -exec - then rm -f 1.${COTEMP}.x -exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/fmtmsg.h -exec - fi -exec - ;; -exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || { +exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_fmtmsg' ast_lib.h > /dev/null || { exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x exec - then rm -f 1.${COTEMP}.x exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/fmtmsg.h exec - fi -exec - } -exec - ;; -exec - esac +exec - } prev ${INSTALLROOT}/include/prototyped.h implicit done ${INSTALLROOT}/include/ast/fmtmsg.h generated make ${INSTALLROOT}/include/ast/libgen.h prev comp/libgen.h prev ast_lib.h -exec - case ${mam_cc_HOSTTYPE} in -exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x -exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x -exec - then rm -f 1.${COTEMP}.x -exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/libgen.h -exec - fi -exec - ;; -exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || { +exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_libgen' ast_lib.h > /dev/null || { exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x exec - then rm -f 1.${COTEMP}.x exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/libgen.h exec - fi -exec - } -exec - ;; -exec - esac +exec - } prev ${INSTALLROOT}/include/prototyped.h implicit done ${INSTALLROOT}/include/ast/libgen.h generated make ${INSTALLROOT}/include/ast/syslog.h prev comp/syslog.h prev ast_lib.h -exec - case ${mam_cc_HOSTTYPE} in -exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x -exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x -exec - then rm -f 1.${COTEMP}.x -exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/syslog.h -exec - fi -exec - ;; -exec - *) silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || { +exec - silent grep -l 'define[ ][ ]*_[hl][di][rb]_syslog' ast_lib.h > /dev/null || { exec - proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x exec - if cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x exec - then rm -f 1.${COTEMP}.x exec - else mv 1.${COTEMP}.x ${INSTALLROOT}/include/ast/syslog.h exec - fi -exec - } -exec - ;; -exec - esac +exec - } prev ast_namval.h implicit prev ${INSTALLROOT}/include/prototyped.h implicit done ${INSTALLROOT}/include/ast/syslog.h generated --- src/lib/libcmd/Mamfile +++ src/lib/libcmd/Mamfile 2008-02-14 12:08:37.000000000 +0000 @@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS setv ARFLAGS -cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS ${mam_cc_DLL} setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -29,7 +29,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc --- src/lib/libdll/Mamfile +++ src/lib/libdll/Mamfile 2008-02-14 12:08:37.000000000 +0000 @@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS setv ARFLAGS -cr setv AS as setv ASFLAGS -setv CC cc +setv CC gcc setv mam_cc_FLAGS ${mam_cc_DLL} setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?} setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??} @@ -29,7 +29,7 @@ setv NMAKE nmake setv NMAKEFLAGS setv PR pr setv PRFLAGS -setv SHELL /bin/sh +setv SHELL /bin/bash setv SILENT setv TAR tar setv YACC yacc
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor