diff options
author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /twin | |
parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'twin')
-rw-r--r-- | twin/twin-0.4.6/cross_compile.patch | 156 | ||||
-rw-r--r-- | twin/twin_0.4.6.bb | 0 | ||||
-rw-r--r-- | twin/twutils_0.2.bb | 0 |
3 files changed, 0 insertions, 156 deletions
diff --git a/twin/twin-0.4.6/cross_compile.patch b/twin/twin-0.4.6/cross_compile.patch deleted file mode 100644 index 7f8163a78a..0000000000 --- a/twin/twin-0.4.6/cross_compile.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/Makefile.in twin-0.4.6/Makefile.in ---- ../twin-0.4.6-r0/twin-0.4.6/Makefile.in 2003-03-27 08:29:47 +00:00 -+++ twin-0.4.6/Makefile.in 2004-07-27 13:04:46 +01:00 -@@ -71,33 +71,33 @@ - # to correctly generate include/autoconf.h - # - --ADMIN_LIBTOOLS:=admin/ltmain.sh admin/config.guess admin/config.sub -+#ADMIN_LIBTOOLS:=admin/ltmain.sh admin/config.guess admin/config.sub - --$(ADMIN_LIBTOOLS): -- libtoolize -c -+#$(ADMIN_LIBTOOLS): -+# libtoolize -c - --ADMIN_ACLOCAL:=admin/aclocal.m4 -+#ADMIN_ACLOCAL:=admin/aclocal.m4 - --DISTCLEAN_EMPTY_FILES:=$(ADMIN_ACLOCAL) $(ADMIN_LIBTOOLS) -+#DISTCLEAN_EMPTY_FILES:=$(ADMIN_ACLOCAL) $(ADMIN_LIBTOOLS) - --$(ADMIN_ACLOCAL): -- @if [ -f /usr/share/aclocal/libtool.m4 ]; then \ -- echo $(LN) /usr/share/aclocal/libtool.m4 $@ ; \ -- $(LN) /usr/share/aclocal/libtool.m4 $@ ; \ -- else \ -- echo touch $@; \ -- touch $@; \ -- fi -+#$(ADMIN_ACLOCAL): -+# @if [ -f /usr/share/aclocal/libtool.m4 ]; then \ -+# echo $(LN) /usr/share/aclocal/libtool.m4 $@ ; \ -+# $(LN) /usr/share/aclocal/libtool.m4 $@ ; \ -+# else \ -+# echo touch $@; \ -+# touch $@; \ -+# fi - --configure: configure.in $(ADMIN_LIBTOOLS) $(ADMIN_ACLOCAL) include/autoconf.h.in -- rm -f $@ && autoconf --localdir=admin -+#configure: configure.in $(ADMIN_LIBTOOLS) $(ADMIN_ACLOCAL) include/autoconf.h.in -+# rm -f $@ && autoconf - --include/autoconf.h.in: configure.in -- rm -f $@ && autoheader -+#include/autoconf.h.in: configure.in -+# rm -f $@ && autoheader - --config.status libtool: configure $(ADMIN_LIBTOOLS) -- @echo Updating config.status libtool -- ./configure --cache-file=config.cache --no-create -+#config.status libtool: configure $(ADMIN_LIBTOOLS) -+# @echo Updating config.status libtool -+# ./configure --host --cache-file=config.cache --no-create - - # - # was: -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure twin-0.4.6/configure ---- ../twin-0.4.6-r0/twin-0.4.6/configure 2003-03-27 08:29:47 +00:00 -+++ twin-0.4.6/configure 2004-07-27 13:11:21 +01:00 -@@ -1235,7 +1235,7 @@ - - make_is_good=no - if test "${MAKE-make}"; then -- ${MAKE-make} -v | head -1 | cut -d' ' -f1-4 | cut -d, -f1 | \ -+ ${MAKE-make} -v | head -n 1 | cut -d' ' -f1-4 | cut -d, -f1 | \ - while read make_GNU make_Make make_version make_numbers - do - if test "$make_GNU" = "GNU" -a "$make_Make" = "Make"; then -@@ -2167,7 +2167,7 @@ - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) -- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1` -+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1` - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' -@@ -3670,7 +3670,7 @@ - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is. - # If DATA tags from a recent dlltool are present, honour them! -- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then -+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname-def; - else - echo EXPORTS > $output_objdir/$soname-def; -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/configure.in twin-0.4.6/configure.in ---- ../twin-0.4.6-r0/twin-0.4.6/configure.in 2003-03-27 08:29:47 +00:00 -+++ twin-0.4.6/configure.in 2004-07-27 13:18:07 +01:00 -@@ -188,7 +188,7 @@ - - make_is_good=no - if test "${MAKE-make}"; then -- ${MAKE-make} -v | head -1 | cut -d' ' -f1-4 | cut -d, -f1 | \ -+ ${MAKE-make} -v | head -n 1 | cut -d' ' -f1-4 | cut -d, -f1 | \ - while read make_GNU make_Make make_version make_numbers - do - if test "$make_GNU" = "GNU" -a "$make_Make" = "Make"; then -@@ -378,7 +378,16 @@ - select strdup strerror strspn strstr scandir alphasort uname \ - vprintf vsprintf vsnprintf wait3 wait4 getpt grantpt unlockpt ptsname) - --AC_CHECK_FILE(/dev/ptmx) -+AC_SEARCH_LIBS(openpty,util, -+ [ -+ AC_DEFINE(HAVE_OPENPTY,1,[define if you have openpty function]) -+ no_dev_ptmx=yes -+ ]) -+AC_CHECK_FUNCS([_getpty]) -+if test -z "$no_dev_ptmx" ; then -+ AC_CHECK_FILE(/dev/ptmx) -+fi -+ - AC_CHECK_FUNC(crypt,,AC_CHECK_LIB(crypt,crypt)) - AC_CHECK_FUNC(dlopen,,AC_CHECK_LIB(dl,dlopen)) - AC_CHECK_LIB(ltdl,lt_dlopen) -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/makerules twin-0.4.6/makerules ---- ../twin-0.4.6-r0/twin-0.4.6/makerules 2003-03-27 08:29:48 +00:00 -+++ twin-0.4.6/makerules 2004-07-27 13:04:46 +01:00 -@@ -794,7 +794,7 @@ - endif - - $(TOPDIR)/scripts/Getsizes: $(TOPDIR)/scripts/getsizes.c $(TOPDIR)/include/Tw/datatypes.h $(TOPDIR)/include/autoconf.h -- $(CC) $(CC_FLAGS) $(CC_FLAGS_script_getsizes.o) $(LD_FLAGS) $< -o $@ -+ $(HOSTCC) $(CC_FLAGS) $(CC_FLAGS_script_getsizes.o) $(LD_FLAGS) $< -o $@ - @echo "PREVIOUS_CONF__LONG_LONG=$(CONF__LONG_LONG)" > $(TOPDIR)/.long_long.conf - - # -@@ -802,10 +802,10 @@ - # but this is the best place to force creating it - # - $(TOPDIR)/scripts/Mkdep: $(TOPDIR)/scripts/mkdep.c $(TOPDIR)/include/autoconf.h $(TOPDIR)/include/Tw/datasizes.h -- $(CC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@ -+ $(HOSTCC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@ - - $(TOPDIR)/scripts/Bitmap: $(TOPDIR)/scripts/bitmap.c -- $(CC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@ -+ $(HOSTCC) $(CC_FLAGS) $(LD_FLAGS) $< -o $@ - - - # -diff -urNd ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c twin-0.4.6/scripts/mkdep.c ---- ../twin-0.4.6-r0/twin-0.4.6/scripts/mkdep.c 2003-03-27 08:29:48 +00:00 -+++ twin-0.4.6/scripts/mkdep.c 2004-07-27 13:04:46 +01:00 -@@ -172,8 +172,8 @@ - putchar('\n'); - } - --static char str_path[3][512]; --static int len_path[3]; -+static char str_path[20][512]; -+static int len_path[20]; - static int max_path = 0; - static int limit_path = sizeof(len_path)/sizeof(len_path[0]); - diff --git a/twin/twin_0.4.6.bb b/twin/twin_0.4.6.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/twin/twin_0.4.6.bb +++ /dev/null diff --git a/twin/twutils_0.2.bb b/twin/twutils_0.2.bb deleted file mode 100644 index e69de29bb2..0000000000 --- a/twin/twutils_0.2.bb +++ /dev/null |