* [Buildroot] [PATCH v2] macchanger: new package
From: Peter Korsgaard @ 2012-10-21 18:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350415814-18453-1-git-send-email-spdawson@gmail.com>
>>>>> "spdawson" == spdawson <spdawson@gmail.com> writes:
spdawson> From: Simon Dawson <spdawson@gmail.com>
spdawson> Signed-off-by: Simon Dawson <spdawson@gmail.com>
spdawson> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
spdawson> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
spdawson> (build-test with a WCHAR-only internal powerpc toolchain)
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] New package liblog4c-localtime
From: Peter Korsgaard @ 2012-10-21 19:10 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=6d4cdb081020bafa7062c6a8cf052b3d5000635c
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: minor fixes]
Signed-off-by: Alexander Varnin <fenixk19@mail.ru>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/liblog4c-localtime/Config.in | 11 +++++++++++
package/liblog4c-localtime/liblog4c-localtime.mk | 18 ++++++++++++++++++
3 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index b78d980..2ba68cf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -485,6 +485,7 @@ source "package/poco/Config.in"
source "package/protobuf/Config.in"
source "package/schifra/Config.in"
source "package/startup-notification/Config.in"
+source "package/liblog4c-localtime/Config.in"
endmenu
menu "Text and terminal handling"
diff --git a/package/liblog4c-localtime/Config.in b/package/liblog4c-localtime/Config.in
new file mode 100644
index 0000000..a2b7a84
--- /dev/null
+++ b/package/liblog4c-localtime/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_LIBLOG4C_LOCALTIME
+ bool "liblog4c-localtime"
+ select BR2_PACKAGE_EXPAT
+ help
+ Log4c is a library of C for flexible logging to files, syslog
+ and other destinations.
+ This version is with localtime patch, to make lib show times in
+ local timezone.
+
+ https://github.com/rcmadruga/log4c-localtime
+ http://log4c.sourceforge.net/
diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
new file mode 100644
index 0000000..3b1642c
--- /dev/null
+++ b/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -0,0 +1,18 @@
+ #############################################################
+ #
+ # liblog4c
+ #
+ #############################################################
+ LIBLOG4C_LOCALTIME_VERSION = 1.0
+ LIBLOG4C_LOCALTIME_SITE = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
+ LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
+ LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
+ LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
+
+define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
+ chmod +x $(@D)/configure
+endef
+
+LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS
+
+ $(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [PATCH] New package liblog4c-localtime
From: Peter Korsgaard @ 2012-10-21 19:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1349948066-12255-1-git-send-email-fenixk19@mail.ru>
>>>>> "Alexander" == Alexander Varnin <fenixk19@mail.ru> writes:
Alexander> Signed-off-by: Alexander Varnin <fenixk19@mail.ru>
Thanks, committed with minor fixes (see below).
Alexander> +++ b/package/liblog4c-localtime/Config.in
Alexander> @@ -0,0 +1,10 @@
Alexander> +config BR2_PACKAGE_LIBLOG4C_LOCALTIME
Alexander> + bool "liblog4c-localtime"
You forgot to select BR2_PACKAGE_EXPAT.
Alexander> + help
Alexander> + Log4c is a library of C for flexible logging to files, syslog
Please no trailing spaces.
Alexander> + and other destinations.
Alexander> + This version is with localtime patch, to make lib show times in
Alexander> + local timezone.
Alexander> +
Alexander> + https://github.com/rcmadruga/log4c-localtime
Alexander> + http://log4c.sourceforge.net/
This should be indented with <tab><space><space> like the rest.
Alexander> diff --git a/package/liblog4c-localtime/liblog4c-localtime.mk b/package/liblog4c-localtime/liblog4c-localtime.mk
Alexander> new file mode 100644
Alexander> index 0000000..0aedec8
Alexander> --- /dev/null
Alexander> +++ b/package/liblog4c-localtime/liblog4c-localtime.mk
Alexander> @@ -0,0 +1,18 @@
Alexander> + #############################################################
Alexander> + #
Alexander> + # liblog4c
Alexander> + #
Alexander> + #############################################################
Alexander> + LIBLOG4C_LOCALTIME_VERSION = 1.0
Alexander> + LIBLOG4C_LOCALTIME_SITE = https://github.com/rcmadruga/log4c-localtime/tarball/v$(LIBLOG4C_LOCALTIME_VERSION)
Please no trailing spaces.
Alexander> + LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
Alexander> + LIBLOG4C_LOCALTIME_CONF_OPT = --disable-expattest
Alexander> + LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
Alexander> +
Alexander> + define LIBLOG4C_LOCALTIME_HOOK
Alexander> + chmod +x $(@D)/configure
Alexander> + endef
Alexander> +
Alexander> + LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_HOOK
Please don't indent this. I renamed this hook to
LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS to make it clear what it does.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] openssl: disable apps for NOMMU
From: Peter Korsgaard @ 2012-10-21 19:15 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350388760-5447-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> The openssl binary uses fork() so disable the option and build for !MMU.
Gustavo> Fixes
Gustavo> http://autobuild.buildroot.net/results/45a9b84c16caadbf77b6fc43d7a0001c981a4c87/build-end.log
Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Gustavo> ---
Gustavo> package/openssl/Config.in | 2 ++
Gustavo> package/openssl/openssl.mk | 9 +++++++++
Gustavo> 2 files changed, 11 insertions(+), 0 deletions(-)
Gustavo> diff --git a/package/openssl/Config.in b/package/openssl/Config.in
Gustavo> index 6ba644a..2187023 100644
Gustavo> --- a/package/openssl/Config.in
Gustavo> +++ b/package/openssl/Config.in
Gustavo> @@ -12,6 +12,8 @@ config BR2_PACKAGE_OPENSSL
Gustavo> config BR2_PACKAGE_OPENSSL_BIN
Gustavo> bool "openssl binary"
Gustavo> depends on BR2_PACKAGE_OPENSSL
Gustavo> + # uses fork()
Gustavo> + depends on BR2_USE_MMU
Gustavo> help
Gustavo> Install the openssl binary to the target file system. This is a
Gustavo> command line tool for doing various crypthographic stuff.
Gustavo> diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
Gustavo> index 0917344..d283046 100644
Gustavo> --- a/package/openssl/openssl.mk
Gustavo> +++ b/package/openssl/openssl.mk
Gustavo> @@ -13,6 +13,15 @@ OPENSSL_DEPENDENCIES = zlib
Gustavo> OPENSSL_TARGET_ARCH = generic32
Gustavo> OPENSSL_CFLAGS = $(TARGET_CFLAGS)
Gustavo> +ifeq ($(BR2_USE_MMU),)
Why is this not BR2_PACKAGE_OPENSSL_BIN instead?
Gustavo> +define OPENSSL_DISABLE_APPS
Gustavo> + $(SED) '/^build_apps/! s/build_apps//' $(@D)/Makefile.org
Gustavo> + $(Q)touch $(@D)/apps/openssl
Gustavo> +endef
Gustavo> +endif
Gustavo> +
Gustavo> +OPENSSL_PRE_CONFIGURE_HOOKS += OPENSSL_DISABLE_APPS
Gustavo> +
Gustavo> ifeq ($(BR2_PACKAGE_OPENSSL_OCF),y)
Gustavo> OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
Gustavo> OPENSSL_DEPENDENCIES += ocf-linux
Gustavo> --
Gustavo> 1.7.8.6
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] webkit: Fix build issue with gcc-4.6 and above
From: Peter Korsgaard @ 2012-10-21 19:22 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=787278356d19771ed32c8addd45480beae78a303
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This fixes the "Unknown parameter for tags/attrs" build error.
Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe
[PATCH] 2011-04-17 Thierry Reding
<thierry.reding@avionic-design.de>
Reviewed by Adam Barth.
Fix build with GCC 4.6.
* dom/make_names.pl: Execute preprocessor without the -P option. The
preprocessor in GCC 4.6 eats empty lines, effectively breaking the
parsing performed by this script. Dropping the -P option when invoking
the preprocessor keeps the empty lines but as a side-effect also adds
additional linemarkers.
From the cpp manpage:
-P Inhibit generation of linemarkers in the output from the
preprocessor. This might be useful when running the preprocessor
on something that is not C code, and will be sent to a program
which might be confused by the linemarkers.
The linemarkers are not problematic, however, because the script
properly handles them by ignoring all lines starting with a #.
Signed-off-by: Valentine Barshak <gvaxon@gmail.com>
Tested-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/webkit/webkit-fix-build-with-gcc-4-6.patch | 45 ++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/package/webkit/webkit-fix-build-with-gcc-4-6.patch b/package/webkit/webkit-fix-build-with-gcc-4-6.patch
new file mode 100644
index 0000000..181c7f5
--- /dev/null
+++ b/package/webkit/webkit-fix-build-with-gcc-4-6.patch
@@ -0,0 +1,45 @@
+Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe:
+Removed the ChangeLog part.
+
+From: "commit-queue at webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Mon, 18 Apr 2011 06:53:23 +0000
+Subject: [PATCH] 2011-04-17 Thierry Reding
+ <thierry.reding@avionic-design.de>
+
+ Reviewed by Adam Barth.
+
+ Fix build with GCC 4.6.
+
+ * dom/make_names.pl: Execute preprocessor without the -P option. The
+ preprocessor in GCC 4.6 eats empty lines, effectively breaking the
+ parsing performed by this script. Dropping the -P option when invoking
+ the preprocessor keeps the empty lines but as a side-effect also adds
+ additional linemarkers.
+
+ From the cpp manpage:
+
+ -P Inhibit generation of linemarkers in the output from the
+ preprocessor. This might be useful when running the preprocessor
+ on something that is not C code, and will be sent to a program
+ which might be confused by the linemarkers.
+
+ The linemarkers are not problematic, however, because the script
+ properly handles them by ignoring all lines starting with a #.
+
+diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl
+index 836137e..50386e0 100755
+--- a/WebCore/dom/make_names.pl
++++ b/WebCore/dom/make_names.pl
+@@ -54,7 +54,7 @@ if ($ENV{CC}) {
+ } else {
+ $gccLocation = "/usr/bin/gcc";
+ }
+-my $preprocessor = $gccLocation . " -E -P -x c++";
++my $preprocessor = $gccLocation . " -E -x c++";
+
+ GetOptions(
+ 'tags=s' => \$tagsFile,
+--
+1.7.11.4
+
^ permalink raw reply related
* [Buildroot] [PATCH v2] webkit: Fix build issue with gcc-4.6 and above
From: Peter Korsgaard @ 2012-10-21 19:23 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350309107-31873-1-git-send-email-gvaxon@gmail.com>
>>>>> "Valentine" == Valentine Barshak <gvaxon@gmail.com> writes:
Valentine> This fixes the "Unknown parameter for tags/attrs" build error.
Valentine> Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] luajit: bump to version 2.0.0-beta11
From: Peter Korsgaard @ 2012-10-21 19:28 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0a227142c9bdbd234031e107ce920c94aa85bb1b
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
this release includes my 2 requests, see http://www.freelists.org/post/luajit/LuaJIT-on-Buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/luajit/luajit-01-root-path.patch | 10 +++++-----
package/luajit/luajit-02-shared-lib.patch | 2 +-
package/luajit/luajit-03-dont-strip.patch | 2 +-
package/luajit/luajit-04-no-bin-symlink.patch | 12 ++++++------
package/luajit/luajit.mk | 17 +++++++++++------
5 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/package/luajit/luajit-01-root-path.patch b/package/luajit/luajit-01-root-path.patch
index 3b0a585..80ad1e9 100644
--- a/package/luajit/luajit-01-root-path.patch
+++ b/package/luajit/luajit-01-root-path.patch
@@ -7,10 +7,10 @@ Index: b/src/luaconf.h
===================================================================
--- a/src/luaconf.h
+++ b/src/luaconf.h
-@@ -22,9 +22,9 @@
- #define LUA_CPATH_DEFAULT \
- ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
+@@ -26,9 +26,9 @@
+ ** Note to distribution maintainers: do NOT patch the following line!
+ ** Please read ../doc/install.html#distro and pass PREFIX=/usr instead.
+ */
-#define LUA_ROOT "/usr/local/"
-#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
-#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
@@ -18,5 +18,5 @@ Index: b/src/luaconf.h
+#define LUA_LDIR LUA_ROOT "share/lua/"
+#define LUA_CDIR LUA_ROOT "lib/lua/"
#ifdef LUA_XROOT
- #define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta10/"
+ #define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta11/"
#define LUA_XPATH \
diff --git a/package/luajit/luajit-02-shared-lib.patch b/package/luajit/luajit-02-shared-lib.patch
index d5122ba..361e5c2 100644
--- a/package/luajit/luajit-02-shared-lib.patch
+++ b/package/luajit/luajit-02-shared-lib.patch
@@ -6,7 +6,7 @@ Index: b/src/Makefile
===================================================================
--- a/src/Makefile
+++ b/src/Makefile
-@@ -629,7 +629,7 @@
+@@ -669,7 +669,7 @@
$(LUAJIT_T): $(TARGET_O) $(LUAJIT_O) $(TARGET_DEP)
$(E) "LINK $@"
diff --git a/package/luajit/luajit-03-dont-strip.patch b/package/luajit/luajit-03-dont-strip.patch
index 9651cdf..66bdadf 100644
--- a/package/luajit/luajit-03-dont-strip.patch
+++ b/package/luajit/luajit-03-dont-strip.patch
@@ -8,7 +8,7 @@ Index: b/src/Makefile
===================================================================
--- a/src/Makefile
+++ b/src/Makefile
-@@ -625,12 +625,10 @@
+@@ -665,12 +665,10 @@
$(LUAJIT_SO): $(LJVMCORE_O)
$(E) "DYNLINK $@"
$(Q)$(TARGET_LD) $(TARGET_ASHLDFLAGS) -o $@ $(LJVMCORE_DYNO) $(TARGET_ALIBS)
diff --git a/package/luajit/luajit-04-no-bin-symlink.patch b/package/luajit/luajit-04-no-bin-symlink.patch
index 3eed7de..91a470a 100644
--- a/package/luajit/luajit-04-no-bin-symlink.patch
+++ b/package/luajit/luajit-04-no-bin-symlink.patch
@@ -6,7 +6,7 @@ Index: b/Makefile
===================================================================
--- a/Makefile
+++ b/Makefile
-@@ -41,8 +41,7 @@
+@@ -43,8 +43,7 @@
INSTALL_MAN= $(INSTALL_SHARE)/man/man1
INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
@@ -16,7 +16,7 @@ Index: b/Makefile
INSTALL_ANAME= libluajit-$(ABIVER).a
INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
INSTALL_SOSHORT= libluajit-$(ABIVER).so
-@@ -56,7 +55,6 @@
+@@ -58,7 +57,6 @@
INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
@@ -24,10 +24,10 @@ Index: b/Makefile
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \
-@@ -114,13 +112,6 @@
+@@ -120,13 +118,6 @@
$(RM) $(FILE_PC).tmp
cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
- cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+ cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
- @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
- @echo ""
- @echo "Note: the beta releases deliberately do NOT install a symlink for luajit"
@@ -36,5 +36,5 @@ Index: b/Makefile
- @echo " $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)"
- @echo ""
- ##############################################################################
-
+ uninstall:
+ @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 913bc0c..2583f92 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
#
#############################################################
-LUAJIT_VERSION = 2.0.0-beta10
+LUAJIT_VERSION = 2.0.0-beta11
LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
LUAJIT_SITE = http://luajit.org/download
LUAJIT_LICENSE = MIT
@@ -12,12 +12,8 @@ LUAJIT_LICENSE_FILES = COPYRIGHT
LUAJIT_INSTALL_STAGING = YES
-define LUAJIT_NOLARGEFILE_FIX_MAKEFILE
- $(SED) 's/TARGET_XCFLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE/TARGET_XCFLAGS=/' $(@D)/src/Makefile
-endef
-
ifneq ($(BR2_LARGEFILE),y)
-LUAJIT_POST_PATCH_HOOKS += LUAJIT_NOLARGEFILE_FIX_MAKEFILE
+LUAJIT_NO_LARGEFILE = TARGET_LFSFLAGS=
endif
# The luajit build procedure requires the host compiler to have the
@@ -47,6 +43,7 @@ define LUAJIT_BUILD_CMDS
HOST_CC="$(LUAJIT_HOST_CC)" \
HOST_CFLAGS="$(HOST_CFLAGS)" \
HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+ $(LUAJIT_NO_LARGEFILE) \
-C $(@D) amalg
endef
@@ -58,6 +55,14 @@ define LUAJIT_INSTALL_TARGET_CMDS
$(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) install
endef
+define LUAJIT_UNINSTALL_STAGING_CMDS
+ $(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" -C $(@D) uninstall
+endef
+
+define LUAJIT_UNINSTALL_TARGET_CMDS
+ $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" -C $(@D) uninstall
+endef
+
define LUAJIT_CLEAN_CMDS
-$(MAKE) -C $(@D) clean
endef
^ permalink raw reply related
* [Buildroot] [PATCH] luajit: bump to version 2.0.0-beta11
From: Peter Korsgaard @ 2012-10-21 19:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1350586599-31757-1-git-send-email-francois.perrad@gadz.org>
>>>>> "Francois" == Francois Perrad <fperrad@gmail.com> writes:
Francois> this release includes my 2 requests, see http://www.freelists.org/post/luajit/LuaJIT-on-Buildroot
Francois> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Selecting custom skeleton hides terminal settings Why ?
From: Sagaert Johan @ 2012-10-21 19:36 UTC (permalink / raw)
To: buildroot
Hi
(2012.11 git)
When i select a custom skeleton the settings for the login prompt (ttyxxx) and baudrate are hidden .
Can someone explain why this was altered this way ?
Regards Johan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121021/e6cbca8a/attachment.html>
^ permalink raw reply
* [Buildroot] [PATCH 1/1] newt: convert to autotools-package infra
From: Peter Korsgaard @ 2012-10-21 19:37 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1349984799-25887-1-git-send-email-s.martin49@gmail.com>
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Committed with minor tweaks, see below:
Samuel> +NEWT_VERSION = 0.51.0
Samuel> +NEWT_SITE = http://www.uclibc.org/
Samuel> +NEWT_SOURCE = newt-$(NEWT_VERSION).tar.bz2
Samuel> +NEWT_LICENSE = GPLv2
Samuel> +NEWT_LICENSE_FILES = COPYING
Samuel> +NEWT_INSTALL_STAGING = YES
Samuel> +
Samuel> +NEWT_DEPENDENCIES = slang
Samuel> +
Samuel> +NEWT_CONF_OPT += \
Samuel> + --prefix=/usr \
Samuel> + --exec-prefix=/usr \
Samuel> + --bindir=/usr/bin \
Samuel> + --sbindir=/usr/sbin \
Samuel> + --libdir=/lib \
Samuel> + --libexecdir=/usr/lib \
Samuel> + --sysconfdir=/etc \
Samuel> + --datadir=/usr/share \
Samuel> + --localstatedir=/var \
Samuel> + --mandir=/usr/man \
Samuel> + --infodir=/usr/info \
Samuel> + $(DISABLE_NLS)
All of these are handled by pkg-autotools, so can be dropped.
Samuel> +
Samuel> +NEWT_MAKE_ENV += $(TARGET_CONFIGURE_OPTS)
Samuel> +NEWT_MAKE = $(MAKE1)
Samuel> +
Samuel> +define NEWT_INSTALL_STAGING_CMDS
Samuel> + $(INSTALL) -D -m644 $(@D)/newt.h $(STAGING_DIR)/usr/include/newt.h
Samuel> + $(INSTALL) -D -m644 $(@D)/libnewt.a $(STAGING_DIR)/usr/lib/libnewt.a
Samuel> + $(INSTALL) -m755 $(@D)/libnewt.so* $(STAGING_DIR)/usr/lib/
Samuel> + ln -fs libnewt.so.$(NEWT_VERSION) $(STAGING_DIR)/usr/lib/libnewt.so
Samuel> + ln -fs libnewt.so.$(NEWT_VERSION) $(STAGING_DIR)/usr/lib/libnewt.so.0.51
Samuel> +endef
Samuel> +
Samuel> +define NEWT_INSTALL_TARGET_CMDS
Samuel> + $(INSTALL) -d $(TARGET_DIR)/usr/lib/
Samuel> cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/
Samuel> - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so*
We normally install everything into target as well (which then gets
cleaned up by target-finalize if needed), so I changed
_INSTALL_TARGET_CMDS to do the same as for STAGING.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] newt: convert to autotools-package infra
From: Peter Korsgaard @ 2012-10-21 19:38 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=a34896a8d7ee175d90b8cce244d4cfa11863292a
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
[Peter: drop uneeded configure args, full install to target]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/newt/newt-fix-makefile.patch | 42 +++++++++++++
package/newt/newt.mk | 106 +++++++++------------------------
2 files changed, 71 insertions(+), 77 deletions(-)
diff --git a/package/newt/newt-fix-makefile.patch b/package/newt/newt-fix-makefile.patch
new file mode 100644
index 0000000..227b0f3
--- /dev/null
+++ b/package/newt/newt-fix-makefile.patch
@@ -0,0 +1,42 @@
+Fix Makefile.in
+
+* Remove -Os from the CFLAGS (already handled by Buildroot)
+* Use $(CC) instead of $(CPP) to generate .depend file because
+ '$(CPP) -M' call does not support multiple input files.
+ This avoid the following error:
+
+make[1]: Entering directory `/opt/br/output/build/newt-0.51.0'
+/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend
+arm-none-linux-gnueabi-cpp: too many input files
+make[1]: *** [depend] Error 1
+make[1]: Leaving directory
+`/opt/br/output/build/newt-0.51.0'
+make: ***
+[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2
+
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+
+---
+Index: newt-0.51.0/Makefile.in
+===================================================================
+--- newt-0.51.0.orig/Makefile.in 2012-10-10 22:43:42.042318041 +0200
++++ newt-0.51.0/Makefile.in 2012-10-11 21:25:44.063873277 +0200
+@@ -3,7 +3,7 @@ SHLIBS = -lslang -lm -lc
+
+ GPM_SUPPORT=@gpm_support@
+
+-CFLAGS = -Wall -Os -D_GNU_SOURCE
++CFLAGS += -D_GNU_SOURCE
+
+ VERSION = @VERSION@
+ CVSTAG = r$(subst .,-,$(VERSION))
+@@ -86,7 +86,7 @@ clean:
+ $(SHAREDOBJS) *.so*
+
+ depend:
+- $(CPP) $(CFLAGS) -M $(SOURCES) > .depend
++ $(CC) $(CFLAGS) -M $(SOURCES) > .depend
+
+ $(SHAREDDIR):
+ mkdir -p $(SHAREDDIR)
diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index b10e4f8..8a0c647 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -3,80 +3,32 @@
# newt
#
#############################################################
-NEWT_SOURCE=newt-0.51.0.tar.bz2
-NEWT_CAT:=$(BZCAT)
-NEWT_SITE=http://www.uclibc.org/
-NEWT_DIR=$(BUILD_DIR)/newt-0.51.0
-NEWT_VERSION=0.51.0
-NEWT_CFLAGS=-Os -g -fPIC
-
-$(DL_DIR)/$(NEWT_SOURCE):
- $(call DOWNLOAD,$(NEWT_SITE)/$(NEWT_SOURCE))
-
-$(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE)
- $(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(NEWT_DIR)/.source
-
-$(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
- (cd $(NEWT_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- $(TARGET_CONFIGURE_ARGS) \
- CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" \
- ./configure $(QUIET) \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libdir=/lib \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- $(DISABLE_NLS) \
- )
- touch $(NEWT_DIR)/.configured
-
-$(NEWT_DIR)/libnewt.so.$(NEWT_VERSION): $(NEWT_DIR)/.configured
- $(MAKE1) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR)
- touch -c $@
-
-$(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION)
- cp -a $(NEWT_DIR)/libnewt.a $(STAGING_DIR)/usr/lib/
- cp -a $(NEWT_DIR)/newt.h $(STAGING_DIR)/usr/include/
- cp -a $(NEWT_DIR)/libnewt.so* $(STAGING_DIR)/usr/lib/
- (cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so)
- (cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so.0.51)
- touch -c $@
-
-$(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt.a
- cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so*
- touch -c $@
-
-newt-legal-info:
- @$(call legal-warning-pkg,newt,legal-info not yet implemented)
-
-newt: slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION)
-
-newt-source: $(DL_DIR)/$(NEWT_SOURCE)
-
-newt-clean:
- rm -f $(TARGET_DIR)/usr/lib/libnewt.so*
- -$(MAKE) -C $(NEWT_DIR) clean
-
-newt-dirclean: slang-dirclean
- rm -rf $(NEWT_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_NEWT),y)
-TARGETS+=newt
-endif
+NEWT_VERSION = 0.51.0
+NEWT_SITE = http://www.uclibc.org/
+NEWT_SOURCE = newt-$(NEWT_VERSION).tar.bz2
+NEWT_LICENSE = GPLv2
+NEWT_LICENSE_FILES = COPYING
+NEWT_INSTALL_STAGING = YES
+
+NEWT_DEPENDENCIES = slang
+
+NEWT_MAKE_ENV += $(TARGET_CONFIGURE_OPTS)
+NEWT_MAKE = $(MAKE1)
+
+define NEWT_INSTALL_STAGING_CMDS
+ $(INSTALL) -D -m644 $(@D)/newt.h $(STAGING_DIR)/usr/include/newt.h
+ $(INSTALL) -D -m644 $(@D)/libnewt.a $(STAGING_DIR)/usr/lib/libnewt.a
+ $(INSTALL) -m755 $(@D)/libnewt.so* $(STAGING_DIR)/usr/lib/
+ ln -fs libnewt.so.$(NEWT_VERSION) $(STAGING_DIR)/usr/lib/libnewt.so
+ ln -fs libnewt.so.$(NEWT_VERSION) $(STAGING_DIR)/usr/lib/libnewt.so.0.51
+endef
+
+define NEWT_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m644 $(@D)/newt.h $(TARGET_DIR)/usr/include/newt.h
+ $(INSTALL) -D -m644 $(@D)/libnewt.a $(TARGET_DIR)/usr/lib/libnewt.a
+ $(INSTALL) -m755 $(@D)/libnewt.so* $(TARGET_DIR)/usr/lib/
+ ln -fs libnewt.so.$(NEWT_VERSION) $(TARGET_DIR)/usr/lib/libnewt.so
+ ln -fs libnewt.so.$(NEWT_VERSION) $(TARGET_DIR)/usr/lib/libnewt.so.0.51
+endef
+
+$(eval $(autotools-package))
^ permalink raw reply related
* [Buildroot] [git commit] manual: remove Manual Makefile section
From: Peter Korsgaard @ 2012-10-21 19:39 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=93e4785aa4057649fdeb18954a51c4a1bc833eea
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
docs/manual/adding-packages-handwritten.txt | 167 ---------------------------
docs/manual/adding-packages.txt | 2 -
2 files changed, 0 insertions(+), 169 deletions(-)
diff --git a/docs/manual/adding-packages-handwritten.txt b/docs/manual/adding-packages-handwritten.txt
deleted file mode 100644
index beb25f6..0000000
--- a/docs/manual/adding-packages-handwritten.txt
+++ /dev/null
@@ -1,167 +0,0 @@
-[[handwritten-tutorial]]
-
-Manual Makefile
----------------
-
-*NOTE: new manual makefiles should not be created, and existing manual
-makefiles should be converted either to the generic, autotools or
-cmake infrastructure. This section is only kept to document the
-existing manual makefiles and to help understand how they work.*
-
-------------------------
-01: #############################################################
-02: #
-03: # libfoo
-04: #
-05: #############################################################
-06: LIBFOO_VERSION = 1.0
-07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
-08: LIBFOO_SITE = http://www.foosoftware.org/downloads
-09: LIBFOO_DIR = $(BUILD_DIR)/foo-$(FOO_VERSION)
-10: LIBFOO_BINARY = foo
-11: LIBFOO_TARGET_BINARY = usr/bin/foo
-12:
-13: $(DL_DIR)/$(LIBFOO_SOURCE):
-14: $(call DOWNLOAD,$(LIBFOO_SITE)/$(LIBFOO_SOURCE))
-15:
-16: $(LIBFOO_DIR)/.source: $(DL_DIR)/$(LIBFOO_SOURCE)
-17: $(ZCAT) $(DL_DIR)/$(LIBFOO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-18: touch $@
-19:
-20: $(LIBFOO_DIR)/.configured: $(LIBFOO_DIR)/.source
-21: (cd $(LIBFOO_DIR); rm -rf config.cache; \
-22: $(TARGET_CONFIGURE_OPTS) \
-23: $(TARGET_CONFIGURE_ARGS) \
-24: ./configure \
-25: --target=$(GNU_TARGET_NAME) \
-26: --host=$(GNU_TARGET_NAME) \
-27: --build=$(GNU_HOST_NAME) \
-28: --prefix=/usr \
-29: --sysconfdir=/etc \
-30: )
-31: touch $@
-32:
-33: $(LIBFOO_DIR)/$(LIBFOO_BINARY): $(LIBFOO_DIR)/.configured
-34: $(MAKE) CC=$(TARGET_CC) -C $(LIBFOO_DIR)
-35:
-36: $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY): $(LIBFOO_DIR)/$(LIBFOO_BINARY)
-37: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIBFOO_DIR) install-strip
-38: rm -Rf $(TARGET_DIR)/usr/man
-39:
-40: libfoo: uclibc ncurses $(TARGET_DIR)/$(LIBFOO_TARGET_BINARY)
-41:
-42: libfoo-source: $(DL_DIR)/$(LIBFOO_SOURCE)
-43:
-44: libfoo-clean:
-45: $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBFOO_DIR) uninstall
-46: -$(MAKE) -C $(LIBFOO_DIR) clean
-47:
-48: libfoo-dirclean:
-49: rm -rf $(LIBFOO_DIR)
-50:
-51: #############################################################
-52: #
-53: # Toplevel Makefile options
-54: #
-55: #############################################################
-56: ifeq ($(BR2_PACKAGE_LIBFOO),y)
-57: TARGETS += libfoo
-58: endif
-------------------------
-
-First of all, this Makefile example works for a package which
-comprises a single binary executable. For other software, such as
-libraries or more complex stuff with multiple binaries, it must be
-qqadapted. For examples look at the other +*.mk+ files in the
-+package+ directory.
-
-At lines 6-11, a couple of useful variables are defined:
-
-* +LIBFOO_VERSION+: The version of 'libfoo' that should be downloaded.
-
-* +LIBFOO_SOURCE+: The name of the tarball of 'libfoo' on the download
- website or FTP site. As you can see +LIBFOO_VERSION+ is used.
-
-* +LIBFOO_SITE+: The HTTP or FTP site from which 'libfoo' archive is
- downloaded. It must include the complete path to the directory where
- +LIBFOO_SOURCE+ can be found.
-
-* +LIBFOO_DIR+: The directory into which the software will be
- configured and compiled. Basically, it's a subdirectory of
- +BUILD_DIR+ which is created upon decompression of the tarball.
-
-* +LIBFOO_BINARY+: Software binary name. As said previously, this is
- an example for a package with a single binary.
-
-* +LIBFOO_TARGET_BINARY+: The full path of the binary inside the
- target filesystem. Lines 13-14 define a target that downloads the
- tarball from the remote site to the download directory (+DL_DIR+).
-
-Lines 16-18 define a target and associated rules that uncompress the
-downloaded tarball. As you can see, this target depends on the tarball
-file so that the previous target (lines 13-14) is called before
-executing the rules of the current target. Uncompressing is followed
-by 'touching' a hidden file to mark the software as having been
-uncompressed. This trick is used everywhere in a Buildroot Makefile to
-split steps (download, uncompress, configure, compile, install) while
-still having correct dependencies.
-
-Lines 20-31 define a target and associated rules that configure the
-software. It depends on the previous target (the hidden +.source+
-file) so that we are sure the software has been uncompressed. In order
-to configure the package, it basically runs the well-known
-+./configure+ script. As we may be doing cross-compilation, +target+,
-+host+ and +build+ arguments are given. The prefix is also set to
-+/usr+, not because the software will be installed in +/usr+ on your
-host system, but because the software will be installed in + /usr+ on
-the target filesystem. Finally it creates a +.configured+ file to mark
-the software as configured.
-
-Lines 33-34 define a target and a rule that compile the software. This
-target will create the binary file in the compilation directory and
-depends on the software being already configured (hence the reference
-to the +.configured+ file). It basically runs +make+ inside the
-source directory.
-
-Lines 36-38 define a target and associated rules that install the
-software inside the target filesystem. They depend on the binary file
-in the source directory to make sure the software has been
-compiled. They use the +install-strip+ target of the software
-+Makefile+ by passing a +DESTDIR+ argument so that the +Makefile+
-doesn't try to install the software in the host +/usr+ but rather in
-the target +/usr+. After the installation, the +/usr/man + directory
-inside the target filesystem is removed to save space.
-
-Line 40 defines the main target of the software — the one that
-will eventually be used by the top level +Makefile+ to download,
-compile, and then install this package. This target should first of
-all depend on all needed dependencies of the software (in our example,
-'uclibc' and 'ncurses') and also depend on the final binary. This last
-dependency will call all previous dependencies in the correct order.
-
-Line 42 defines a simple target that only downloads the code
-source. This is not used during normal operation of Buildroot, but is
-needed if you intend to download all required sources at once for
-later offline build. Note that if you add a new package, providing a
-+libfoo-source+ target is 'mandatory' to support users that wish to do
-offline-builds. Furthermore, it eases checking if all package-sources
-are downloadable.
-
-Lines 44-46 define a simple target to clean the software build by
-calling the Makefile with the appropriate options. The +-clean+
-target should run +make clean+ on $(BUILD_DIR)/package-version and
-MUST uninstall all files of the package from $(STAGING_DIR) and from
-$(TARGET_DIR).
-
-Lines 48-49 define a simple target to completely remove the directory
-in which the software was uncompressed, configured and compiled. The
-+-dirclean+ target MUST completely rm $(BUILD_DIR)/ package-version.
-
-Lines 51-58 add the target +libfoo+ to the list of targets to be
-compiled by Buildroot, by first checking if the configuration option
-for this package has been enabled using the configuration tool. If so,
-it then "subscribes" this package to be compiled by adding
-the package to the TARGETS global variable. The name added to the
-TARGETS global variable is the name of this package's target, as
-defined on line 40, which is used by Buildroot to download, compile,
-and then install this package.
diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt
index cb75f2d..f672ec6 100644
--- a/docs/manual/adding-packages.txt
+++ b/docs/manual/adding-packages.txt
@@ -15,8 +15,6 @@ include::adding-packages-autotools.txt[]
include::adding-packages-cmake.txt[]
-include::adding-packages-handwritten.txt[]
-
include::adding-packages-gettext.txt[]
include::adding-packages-conclusion.txt[]
^ permalink raw reply related
* [Buildroot] [PATCH 6/6] manual: remove Manual Makefile section
From: Peter Korsgaard @ 2012-10-21 19:40 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1348266518-27665-7-git-send-email-s.martin49@gmail.com>
>>>>> "Samuel" == Samuel Martin <s.martin49@gmail.com> writes:
Samuel> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Samuel> delete mode 100644 docs/manual/adding-packages-handwritten.txt
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] openssl: disable apps for NOMMU
From: Gustavo Zacarias @ 2012-10-21 19:42 UTC (permalink / raw)
To: buildroot
In-Reply-To: <876263tz4u.fsf@macbook.be.48ers.dk>
On 10/21/12 16:15, Peter Korsgaard wrote:
> Why is this not BR2_PACKAGE_OPENSSL_BIN instead?
Because the change must be done before anything is built.
Since i'm only tweaking the build phase and not the install one in the
build system i need to fake the openssl being built with the touch.
It will then be removed by the BR2_PACKAGE_OPENSSL_BIN knob when it's nommu.
Or maybe i misunderstood what you meant?
Regards.
^ permalink raw reply
* [Buildroot] [PATCH] qtuio: new package
From: Peter Korsgaard @ 2012-10-21 19:47 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1348297189-29498-1-git-send-email-sho@relinux.de>
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:
Stephan> Implementation of an interface connecting TUIO messages and QT events
Stephan> https://github.com/x29a/qTUIO
Stephan> Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Stephan> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Stephan> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Stephan> build-tested with a minimal internal toolchain for ARM.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] qtuio: new package
From: Peter Korsgaard @ 2012-10-21 19:48 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=eed671a9b141870000d074a229f350f776d48bbd
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Implementation of an interface connecting TUIO messages and QT events
https://github.com/x29a/qTUIO
Signed-off-by: Stephan Hoffmann <sho@relinux.de>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
build-tested with a minimal internal toolchain for ARM.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 6 ++++
package/qtuio/Config.in | 18 ++++++++++++
package/qtuio/qtuio.mk | 69 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 93 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index 2ba68cf..6842aab 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -134,6 +134,12 @@ source "package/sdl_gfx/Config.in"
comment "other GUIs"
source "package/efl/Config.in"
source "package/qt/Config.in"
+
+if BR2_PACKAGE_QT
+comment "QT libraries and helper libraries"
+source "package/qtuio/Config.in"
+endif
+
source "package/x11r7/Config.in"
comment "X libraries and helper libraries"
diff --git a/package/qtuio/Config.in b/package/qtuio/Config.in
new file mode 100644
index 0000000..19499fd
--- /dev/null
+++ b/package/qtuio/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_QTUIO
+ bool "qtuio"
+ depends on BR2_PACKAGE_QT_GUI_MODULE
+ help
+ Implementation of an interface connecting TUIO messages
+ and QT events
+
+ https://github.com/x29a/qTUIO
+
+config BR2_QTUIO_EXAMPLES
+ bool "qtuio examples"
+ depends on BR2_PACKAGE_QTUIO
+ help
+ Build and install qtuio examples
+
+comment "qtuio depends on QT gui module"
+ depends on !BR2_PACKAGE_QT_GUI_MODULE
+
diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
new file mode 100644
index 0000000..0ac8874
--- /dev/null
+++ b/package/qtuio/qtuio.mk
@@ -0,0 +1,69 @@
+#############################################################
+#
+# qTUIO
+#
+#############################################################
+QTUIO_VERSION = abe4973ff6
+QTUIO_SITE = git://github.com/x29a/qTUIO.git
+QTUIO_INSTALL_STAGING = YES
+QTUIO_DEPENDENCIES = qt
+
+QTUIO_LICENSE = GPLv3+
+QTUIO_LICENSE_FILES = COPYING
+
+# The pong example needs QtOpenGL support, which might become available
+# some time in the future. Then add pong to the list of examples.
+QTUIO_EXAMPLES = dials fingerpaint knobs pinchzoom
+
+ifeq ($(BR2_QTUIO_EXAMPLES),y)
+define QTUIO_CONFIGURE_EXAMPLES
+ for example in $(QTUIO_EXAMPLES) ; do \
+ (cd $(@D)/examples/$${example} && $(QT_QMAKE)) ; \
+ done
+endef
+endif
+
+define QTUIO_CONFIGURE_CMDS
+ cd $(@D)/src && $(QT_QMAKE)
+ $(QTUIO_CONFIGURE_EXAMPLES)
+endef
+
+ifeq ($(BR2_QTUIO_EXAMPLES),y)
+define QTUIO_BUILD_EXAMPLES
+ for example in $(QTUIO_EXAMPLES) ; do \
+ ($(MAKE) -C $(@D)/examples/$${example}) ; \
+ done
+endef
+endif
+
+define QTUIO_BUILD_CMDS
+ $(MAKE) -C $(@D)/src
+ $(QTUIO_BUILD_EXAMPLES)
+endef
+
+# Unfortunately, there is no working "install" target available
+ifeq ($(BR2_QTUIO_EXAMPLES),y)
+define QTUIO_INSTALL_EXAMPLES
+ for example in $(QTUIO_EXAMPLES) ; do \
+ ($(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example}) ; \
+ done
+endef
+endif
+
+define QTUIO_INSTALL_TARGET_CMDS
+ cp -dpf $(@D)/lib/libqTUIO.so* $(TARGET_DIR)/usr/lib
+ $(QTUIO_INSTALL_EXAMPLES)
+endef
+
+define QTUIO_INSTALL_STAGING_CMDS
+ cp -dpf $(@D)/lib/libqTUIO.so* $(STAGING_DIR)/usr/lib
+endef
+
+define QTUIO_CLEAN_CMDS
+ $(MAKE) -C $(@D)/src clean
+ for example in $(QTUIO_EXAMPLES) ; do \
+ ($(MAKE) -C $(@D)/examples/$${example} clean) ; \
+ done
+endef
+
+$(eval $(generic-package))
^ permalink raw reply related
* [Buildroot] [git commit] python-protobuf: Add support for Python implementation of Google's Protocol Buffers
From: Peter Korsgaard @ 2012-10-21 19:54 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=0c5e24d48bdd63ce55cc8fb2b00f05b501876a60
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Thiago A. Correa <thiago.correa@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/Config.in | 1 +
package/python-protobuf/Config.in | 10 ++++++++++
package/python-protobuf/python-protobuf.mk | 28 ++++++++++++++++++++++++++++
3 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/package/Config.in b/package/Config.in
index 6842aab..1650c71 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -289,6 +289,7 @@ source "package/python-mad/Config.in"
source "package/python-meld3/Config.in"
source "package/python-netifaces/Config.in"
source "package/python-nfc/Config.in"
+source "package/python-protobuf/Config.in"
source "package/python-pygame/Config.in"
source "package/python-serial/Config.in"
source "package/python-setuptools/Config.in"
diff --git a/package/python-protobuf/Config.in b/package/python-protobuf/Config.in
new file mode 100644
index 0000000..ec22057
--- /dev/null
+++ b/package/python-protobuf/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_PROTOBUF
+ bool "python-protobuf"
+ depends on BR2_PACKAGE_PYTHON
+ help
+ Python implementation of the Google Protocol Buffers.
+
+ Protocol buffers are Google's language-neutral, platform-neutral,
+ extensible mechanism for serializing structured data.
+
+ http://code.google.com/p/protobuf/
diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk
new file mode 100644
index 0000000..d853dee
--- /dev/null
+++ b/package/python-protobuf/python-protobuf.mk
@@ -0,0 +1,28 @@
+#############################################################
+#
+# python-protobuf
+#
+#############################################################
+
+PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
+PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
+PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
+PYTHON_PROTOBUF_LICENSE = BSD-3c
+PYTHON_PROTOBUF_LICENSE_FILES = COPYING.txt
+
+PYTHON_PROTOBUF_DEPENDENCIES = python host-python-setuptools \
+ host-python-distutilscross host-protobuf
+
+define PYTHON_PROTOBUF_BUILD_CMDS
+ (cd $(@D)/python; \
+ PYTHONXCPREFIX="$(STAGING_DIR)/usr/" \
+ PATH=$(HOST_PATH) \
+ $(HOST_DIR)/usr/bin/python setup.py build -x)
+endef
+
+define PYTHON_PROTOBUF_INSTALL_TARGET_CMDS
+ (cd $(@D)/python; PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \
+ $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(TARGET_DIR)/usr)
+endef
+
+$(eval $(generic-package))
^ permalink raw reply related
* [Buildroot] [PATCHv3] python-protobuf: Add support for Python implementation of Google's Protocol Buffers
From: Peter Korsgaard @ 2012-10-21 19:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20121005193603.GA7975@localhost.comm5.com.br>
>>>>> "Thiago" == Thiago A Correa <thiago.correa@gmail.com> writes:
Thiago> Signed-off-by: Thiago A. Correa <thiago.correa@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] binutils: add sysroot fix from bug #3049
From: Peter Korsgaard @ 2012-10-21 20:11 UTC (permalink / raw)
To: buildroot
commit: http://git.buildroot.net/buildroot/commit/?id=6bcb68694f50cdc788114c77bdc7ed1ba39e0bef
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Add binutils ld sysroot bug fix.
See http://sourceware.org/bugzilla/show_bug.cgi?id=10340
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
package/binutils/binutils-2.20.1/500-sysroot.patch | 36 ++++++++++++++++++++
package/binutils/binutils-2.20/500-sysroot.patch | 36 ++++++++++++++++++++
package/binutils/binutils-2.21.1/500-sysroot.patch | 36 ++++++++++++++++++++
package/binutils/binutils-2.21/500-sysroot.patch | 36 ++++++++++++++++++++
package/binutils/binutils-2.22/500-sysroot.patch | 36 ++++++++++++++++++++
5 files changed, 180 insertions(+), 0 deletions(-)
diff --git a/package/binutils/binutils-2.20.1/500-sysroot.patch b/package/binutils/binutils-2.20.1/500-sysroot.patch
new file mode 100644
index 0000000..d21e4cb
--- /dev/null
+++ b/package/binutils/binutils-2.20.1/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+ directory first. */
+ if (! entry->is_archive)
+ {
+- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++ /* For absolute pathnames, try to always open the file in the
++ sysroot first. If this fails, try to open the file at the
++ given location. */
++ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ {
+ char *name = concat (ld_sysroot, entry->filename,
+ (const char *) NULL);
+ if (ldfile_try_open_bfd (name, entry))
+ {
+ entry->filename = name;
++ entry->sysrooted = TRUE;
+ return TRUE;
+ }
+ free (name);
+ }
+- else if (ldfile_try_open_bfd (entry->filename, entry))
++
++ if (ldfile_try_open_bfd (entry->filename, entry))
+ {
+ entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.20/500-sysroot.patch b/package/binutils/binutils-2.20/500-sysroot.patch
new file mode 100644
index 0000000..d21e4cb
--- /dev/null
+++ b/package/binutils/binutils-2.20/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+ directory first. */
+ if (! entry->is_archive)
+ {
+- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++ /* For absolute pathnames, try to always open the file in the
++ sysroot first. If this fails, try to open the file at the
++ given location. */
++ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ {
+ char *name = concat (ld_sysroot, entry->filename,
+ (const char *) NULL);
+ if (ldfile_try_open_bfd (name, entry))
+ {
+ entry->filename = name;
++ entry->sysrooted = TRUE;
+ return TRUE;
+ }
+ free (name);
+ }
+- else if (ldfile_try_open_bfd (entry->filename, entry))
++
++ if (ldfile_try_open_bfd (entry->filename, entry))
+ {
+ entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.21.1/500-sysroot.patch b/package/binutils/binutils-2.21.1/500-sysroot.patch
new file mode 100644
index 0000000..d21e4cb
--- /dev/null
+++ b/package/binutils/binutils-2.21.1/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+ directory first. */
+ if (! entry->is_archive)
+ {
+- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++ /* For absolute pathnames, try to always open the file in the
++ sysroot first. If this fails, try to open the file at the
++ given location. */
++ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ {
+ char *name = concat (ld_sysroot, entry->filename,
+ (const char *) NULL);
+ if (ldfile_try_open_bfd (name, entry))
+ {
+ entry->filename = name;
++ entry->sysrooted = TRUE;
+ return TRUE;
+ }
+ free (name);
+ }
+- else if (ldfile_try_open_bfd (entry->filename, entry))
++
++ if (ldfile_try_open_bfd (entry->filename, entry))
+ {
+ entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.21/500-sysroot.patch b/package/binutils/binutils-2.21/500-sysroot.patch
new file mode 100644
index 0000000..d21e4cb
--- /dev/null
+++ b/package/binutils/binutils-2.21/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+ directory first. */
+ if (! entry->is_archive)
+ {
+- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++ /* For absolute pathnames, try to always open the file in the
++ sysroot first. If this fails, try to open the file at the
++ given location. */
++ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ {
+ char *name = concat (ld_sysroot, entry->filename,
+ (const char *) NULL);
+ if (ldfile_try_open_bfd (name, entry))
+ {
+ entry->filename = name;
++ entry->sysrooted = TRUE;
+ return TRUE;
+ }
+ free (name);
+ }
+- else if (ldfile_try_open_bfd (entry->filename, entry))
++
++ if (ldfile_try_open_bfd (entry->filename, entry))
+ {
+ entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ && is_sysrooted_pathname (entry->filename, TRUE);
diff --git a/package/binutils/binutils-2.22/500-sysroot.patch b/package/binutils/binutils-2.22/500-sysroot.patch
new file mode 100644
index 0000000..d21e4cb
--- /dev/null
+++ b/package/binutils/binutils-2.22/500-sysroot.patch
@@ -0,0 +1,36 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -308,18 +308,24 @@
+ directory first. */
+ if (! entry->is_archive)
+ {
+- if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++ /* For absolute pathnames, try to always open the file in the
++ sysroot first. If this fails, try to open the file at the
++ given location. */
++ entry->sysrooted = is_sysrooted_pathname(entry->filename, FALSE);
++ if (IS_ABSOLUTE_PATH (entry->filename) && ld_sysroot && ! entry->sysrooted)
+ {
+ char *name = concat (ld_sysroot, entry->filename,
+ (const char *) NULL);
+ if (ldfile_try_open_bfd (name, entry))
+ {
+ entry->filename = name;
++ entry->sysrooted = TRUE;
+ return TRUE;
+ }
+ free (name);
+ }
+- else if (ldfile_try_open_bfd (entry->filename, entry))
++
++ if (ldfile_try_open_bfd (entry->filename, entry))
+ {
+ entry->sysrooted = IS_ABSOLUTE_PATH (entry->filename)
+ && is_sysrooted_pathname (entry->filename, TRUE);
^ permalink raw reply related
* [Buildroot] [PATCH] openssl: disable apps for NOMMU
From: Peter Korsgaard @ 2012-10-21 20:29 UTC (permalink / raw)
To: buildroot
In-Reply-To: <5084501D.8080405@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> On 10/21/12 16:15, Peter Korsgaard wrote:
>> Why is this not BR2_PACKAGE_OPENSSL_BIN instead?
Gustavo> Because the change must be done before anything is built.
Ok, but why only on !MMU and not when the user has just decided that
they don't want /usr/bin/openssl (E.G. not enable
BR2_PACKAGE_OPENSSL_BIN)? Why would we want to build (but not install)
it when MMU?
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Selecting custom skeleton hides terminal settings Why ?
From: Peter Korsgaard @ 2012-10-21 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <63446FE4CD66446495AD2CCBD689DCB9@JohanW7>
>>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:
Sagaert> Hi
Sagaert> (2012.11 git)
Sagaert> When i select a custom skeleton the settings for the login
Sagaert> prompt (ttyxxx) and baudrate are hidden .
Sagaert> Can someone explain why this was altered this way ?
Because it relies on a specific syntax in the default /etc/inittab, that
might not be present if you use a custom skeleton (perhaps you don't
even have an inittab).
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] Selecting custom skeleton hides terminal settingsWhy ?
From: Sagaert Johan @ 2012-10-21 20:40 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87y5izr2iq.fsf@macbook.be.48ers.dk>
Hi Peter ;
I will try to make a patch so when a custom skeleton is selected you get a choice whether you would like to configure the console
yes/no ?
Could you agree with that ?
Johan
-----Oorspronkelijk bericht-----
Van: buildroot-bounces at busybox.net [mailto:buildroot-bounces at busybox.net] Namens Peter Korsgaard
Verzonden: zondag 21 oktober 2012 22:31
Aan: Sagaert Johan
CC: buildroot at busybox.net
Onderwerp: Re: [Buildroot] Selecting custom skeleton hides terminal settingsWhy ?
>>>>> "Sagaert" == Sagaert Johan <sagaert.johan@skynet.be> writes:
Sagaert> Hi
Sagaert> (2012.11 git)
Sagaert> When i select a custom skeleton the settings for the login Sagaert> prompt (ttyxxx) and baudrate are hidden .
Sagaert> Can someone explain why this was altered this way ?
Because it relies on a specific syntax in the default /etc/inittab, that might not be present if you use a custom skeleton (perhaps
you don't even have an inittab).
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
^ permalink raw reply
* [Buildroot] [PATCH v4 1/2] dependencies: build a host python2 if no suitable one can be found
From: Samuel Martin @ 2012-10-21 21:04 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1342474686-10167-1-git-send-email-s.martin49@gmail.com>
Hi all,
Reviving an old thread...
2012/7/16 Samuel Martin <s.martin49@gmail.com>:
> Some distros choose to change the /usr/bin/python binary, making it pointed
> to python3 instead of python2.
>
> This may have some bad consequences for packages that uses some
> non-python3-compliant python scripts in their build system (eg. in install
> or post-install scripts).
>
> This patch checks for a suitable python2 version (2.6 or 2.7) on the host
> system, and declares the following variables:
> - PYTHON2: pointing to the host python2 binary;
> - NEED_PYTHON2: sets to "host-python" if no python2 binary has been found.
>
> This way, a package using some python2 scripts must:
> - adds $(NEED_PYTHON2) to its dependency list;
> - sets $(PYTHON2) as the python binary to be used.
>
> A side effect of this patch is getting rid of any host python. Buildroot
> can runs on a host without python, or with a too old python2 version, or
> with only python3; in such case, $(NEED_PYTHON2) should be added to the
> dependency list. So, we can get rid of the python dependency check.
>
Just to let you know that this patch may also fix some issues with
scons, which does not seem to support python3 yet.
Any comment about this?
Regards,
--
Sam
^ permalink raw reply
* [Buildroot] [PATCH] binutils: add sysroot fix from bug #3049
From: Peter Korsgaard @ 2012-10-21 21:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1336994568-29695-1-git-send-email-gustavo@zacarias.com.ar>
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
Gustavo> Add binutils ld sysroot bug fix.
Gustavo> See http://sourceware.org/bugzilla/show_bug.cgi?id=10340
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [Bug 3049] binutils have a sysroot bug in ld
From: bugzilla at busybox.net @ 2012-10-21 21:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <bug-3049-163@https.bugs.busybox.net/>
https://bugs.busybox.net/show_bug.cgi?id=3049
Peter Korsgaard <jacmet@uclibc.org> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
--- Comment #4 from Peter Korsgaard <jacmet@uclibc.org> 2012-10-21 21:07:41 UTC ---
Fixed in git by Gustavoz, thanks.
--
Configure bugmail: https://bugs.busybox.net/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox