Commit 4180d4a3 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'misc-fixes1' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents a3609f35 155667c2

package/automake/automake.mk

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ AUTOMAKE_DEPENDENCIES = autoconf microperl 


HOST_AUTOMAKE_DEPENDENCIES = host-autoconf



define GTK_DOC_M4_INSTALL

 $(INSTALL) -m 0644 package/automake/gtk-doc.m4 $(STAGING_DIR)/usr/share/aclocal/

endef



HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL



$(eval $(call AUTOTARGETS,package,automake))

$(eval $(call AUTOTARGETS,package,automake,host))

package/automake/gtk-doc.m4

0 → 100644
+61 −0
Original line number Diff line number Diff line 
dnl -*- mode: autoconf -*-



# serial 1



dnl Usage:

dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])

AC_DEFUN([GTK_DOC_CHECK],

[

  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first

  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first



  dnl check for tools we added during development

  AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])

  AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])

  AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])



  dnl for overriding the documentation installation directory

  AC_ARG_WITH([html-dir],

    AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,

    [with_html_dir='${datadir}/gtk-doc/html'])

  HTML_DIR="$with_html_dir"

  AC_SUBST([HTML_DIR])



  dnl enable/disable documentation building

  AC_ARG_ENABLE([gtk-doc],

    AS_HELP_STRING([--enable-gtk-doc],

                   [use gtk-doc to build documentation [[default=no]]]),,

    [enable_gtk_doc=no])



  if test x$enable_gtk_doc = xyes; then

    ifelse([$1],[],

      [PKG_CHECK_EXISTS([gtk-doc],,

                        AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],

      [PKG_CHECK_EXISTS([gtk-doc >= $1],,

                        AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])

  fi



  AC_MSG_CHECKING([whether to build gtk-doc documentation])

  AC_MSG_RESULT($enable_gtk_doc)



  dnl enable/disable output formats

  AC_ARG_ENABLE([gtk-doc-html],

    AS_HELP_STRING([--enable-gtk-doc-html],

                   [build documentation in html format [[default=yes]]]),,

    [enable_gtk_doc_html=yes])

    AC_ARG_ENABLE([gtk-doc-pdf],

      AS_HELP_STRING([--enable-gtk-doc-pdf],

                     [build documentation in pdf format [[default=no]]]),,

      [enable_gtk_doc_pdf=no])



  if test -z "$GTKDOC_MKPDF"; then

    enable_gtk_doc_pdf=no

  fi





  AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])

  AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])

  AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])

  AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])

  AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])

])

package/tcl/tcl-configure-syntax-error.patch

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
diff -ur tcl8.4.9/unix/configure tcl8.4.9-patched/unix/configure

--- tcl8.4.9/unix/configure	2004-12-06 18:23:45.000000000 -0600

+++ tcl8.4.9-patched/unix/configure	2006-07-06 21:02:18.884355250 -0500

@@ -2131,7 +2131,7 @@

 	    # results, and the version is kept in special file).

 	

 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then

-		system=MP-RAS-`awk '{print }' /etc/.relid'`

+		system=MP-RAS-`awk '{print }' /etc/.relid`

 	    fi

 	    if test "`uname -s`" = "AIX" ; then

 		system=AIX-`uname -v`.`uname -r`

@@ -7322,7 +7322,7 @@

 	    # results, and the version is kept in special file).

 	

 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then

-		system=MP-RAS-`awk '{print }' /etc/.relid'`

+		system=MP-RAS-`awk '{print }' /etc/.relid`

 	    fi

 	    if test "`uname -s`" = "AIX" ; then

 		system=AIX-`uname -v`.`uname -r`

diff -ur tcl8.4.9/unix/tcl.m4 tcl8.4.9-patched/unix/tcl.m4

--- tcl8.4.9/unix/tcl.m4	2004-12-06 18:23:45.000000000 -0600

+++ tcl8.4.9-patched/unix/tcl.m4	2006-07-06 21:02:35.653403250 -0500

@@ -844,7 +844,7 @@

 	    # results, and the version is kept in special file).

 	

 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then

-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`

+		system=MP-RAS-`awk '{print $3}' /etc/.relid`

 	    fi

 	    if test "`uname -s`" = "AIX" ; then

 		system=AIX-`uname -v`.`uname -r`

@@ -2190,7 +2190,7 @@

 	    # results, and the version is kept in special file).

 	

 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then

-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`

+		system=MP-RAS-`awk '{print $3}' /etc/.relid`

 	    fi

 	    if test "`uname -s`" = "AIX" ; then

 		system=AIX-`uname -v`.`uname -r`

package/tcl/tcl-strstr.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
--- tcl8.4.9/compat/strstr.c	2002-01-26 03:10:08.000000000 +0200

+++ tcl8.4.9/compat/strstr.c	2005-05-30 06:53:40.000000000 +0300

@@ -33,6 +33,8 @@

  *----------------------------------------------------------------------

  */

 

+#include <unistd.h>

+

 char *

 strstr(string, substring)

     register char *string;	/* String to search. */