* [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0
@ 2017-05-20 2:16 jon
2017-05-20 2:16 ` [ptxdist] [PATCH 2/3] host-qt4: Enable openssl jon
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: jon @ 2017-05-20 2:16 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
From: Jon Ringle <jringle@gridpoint.com>
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
patches/f2fs-tools-1.6.1/autogen.sh | 1 -
patches/f2fs-tools-1.8.0/autogen.sh | 1 +
rules/f2fs-tools.make | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
delete mode 120000 patches/f2fs-tools-1.6.1/autogen.sh
create mode 120000 patches/f2fs-tools-1.8.0/autogen.sh
diff --git a/patches/f2fs-tools-1.6.1/autogen.sh b/patches/f2fs-tools-1.6.1/autogen.sh
deleted file mode 120000
index 9f8a4cb..0000000
--- a/patches/f2fs-tools-1.6.1/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/f2fs-tools-1.8.0/autogen.sh b/patches/f2fs-tools-1.8.0/autogen.sh
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/f2fs-tools-1.8.0/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/f2fs-tools.make b/rules/f2fs-tools.make
index 1aa8675..756b159 100644
--- a/rules/f2fs-tools.make
+++ b/rules/f2fs-tools.make
@@ -18,8 +18,8 @@ endif
#
# Paths and names
#
-F2FS_TOOLS_VERSION := 1.6.1
-F2FS_TOOLS_MD5 := f4fe0b59ffef1eef71c20d12381a3054
+F2FS_TOOLS_VERSION := 1.8.0
+F2FS_TOOLS_MD5 := d4132ab388d30da729cb270aeac32bf1
F2FS_TOOLS := f2fs-tools-$(F2FS_TOOLS_VERSION)
F2FS_TOOLS_SUFFIX := tar.xz
F2FS_TOOLS_URL := git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;tag=v$(F2FS_TOOLS_VERSION)
--
1.9.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/3] host-qt4: Enable openssl
2017-05-20 2:16 [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 jon
@ 2017-05-20 2:16 ` jon
2017-05-24 9:29 ` Michael Olbrich
2017-05-20 2:16 ` [ptxdist] [PATCH 3/3] ptxd_make_world_compile.sh: conditionally redirect stderr>stdout jon
2017-05-24 14:06 ` [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 Michael Olbrich
2 siblings, 1 reply; 5+ messages in thread
From: jon @ 2017-05-20 2:16 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
From: Jon Ringle <jringle@gridpoint.com>
The build breaks if with a bunch of QSslSocket errors such as:
undefined reference to `QSslSocket::staticMetaObject'
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
rules/host-qt4.in | 1 +
rules/host-qt4.make | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/rules/host-qt4.in b/rules/host-qt4.in
index 1be8b4d..27503ac 100644
--- a/rules/host-qt4.in
+++ b/rules/host-qt4.in
@@ -2,6 +2,7 @@
config HOST_QT4
tristate
+ select HOST_OPENSSL
select HOST_DBUS if HOST_QT4_DBUS
default ALLYES
diff --git a/rules/host-qt4.make b/rules/host-qt4.make
index 6e1b651..66fac05 100644
--- a/rules/host-qt4.make
+++ b/rules/host-qt4.make
@@ -69,7 +69,6 @@ HOST_QT4_AUTOCONF := \
-no-libtiff \
-no-gif \
-no-libjpeg \
- -no-openssl \
-qt-zlib \
-no-freetype \
-stl \
--
1.9.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 3/3] ptxd_make_world_compile.sh: conditionally redirect stderr>stdout
2017-05-20 2:16 [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 jon
2017-05-20 2:16 ` [ptxdist] [PATCH 2/3] host-qt4: Enable openssl jon
@ 2017-05-20 2:16 ` jon
2017-05-24 14:06 ` [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 Michael Olbrich
2 siblings, 0 replies; 5+ messages in thread
From: jon @ 2017-05-20 2:16 UTC (permalink / raw)
To: ptxdist; +Cc: Jon Ringle
From: Jon Ringle <jringle@gridpoint.com>
I discovered after updating to a new version of ptxdist that all of my
compile output including errors/warnings are now all going to stdout
instead of having the errors/warning going to stderr.
This is causing some problem when I use qtcreator as my IDE because
qtcreator will only filter stderr for errors/warnings to put into the
Issues tab, where one can simply click on the error/warning and be taken
right to the source line where the error/warning is found.
I found that this problem was introduced by commit
30b9267e35eea1c2edb4da0231a428bfa25b6766
This patch will conditionally redirect stderr>stdout on compile output
if ptxdist has output synchronization enabled.
This small program demonstrates the behavior with this patch applied:
$ cat local_src/testprog/testprog.c
#include <stdio.h>
#include <stdlib.h>
#error An error here
int main(int argc, char *argv[])
{
printf("Hello World, I'm testprog!\n");
exit(EXIT_SUCCESS);
}
$ ptxdist compile testprog >/dev/null
testprog.c:4:2: error: #error An error here
#error An error here
^
make[1]: *** [testprog] Error 1
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2
$ ptxdist compile --output-sync testprog >/dev/null
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2
$ ptxdist compile --no-output-sync testprog >/dev/null
testprog.c:4:2: error: #error An error here
#error An error here
^
make[1]: *** [testprog] Error 1
make: *** [/home/jringle-admin/code/gpec/ec1k-rootfs/platform-EC1K/state/testprog.compile] Error 2
Signed-off-by: Jon Ringle <jringle@gridpoint.com>
---
bin/ptxdist | 7 ++++++-
scripts/lib/ptxd_make_world_compile.sh | 10 ++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/bin/ptxdist b/bin/ptxdist
index 1e3c53a..7a5b0e4 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -2383,6 +2383,7 @@ setup_config() {
# PTXDIST_PARALLELMFLAGS_INTERN
# PTXDIST_PARALLELMFLAGS_EXTERN
# PTXDIST_OUTPUT_SYNC
+# PTXDIST_STDERR_REDIRECT
#
setup_parallel() {
# default no parallel for now
@@ -2415,15 +2416,18 @@ setup_parallel() {
fi
PTXDIST_OUTPUT_SYNC="${PTXDIST_OUTPUT_SYNC:-${PTXDIST_QUIET}}"
+ PTXDIST_STDERR_REDIRECT=2
if [ "${PTXDIST_OUTPUT_SYNC}" == "1" ]; then
if "${PTXCONF_SETUP_HOST_MAKE}" -h | grep -q -- --output-sync; then
PTXDIST_OUTPUT_SYNC="--output-sync="
fi
+ PTXDIST_STDERR_REDIRECT=1
fi
if [[ "${PTXDIST_OUTPUT_SYNC}" =~ [01] ]]; then
unset PTXDIST_OUTPUT_SYNC
fi
+
#
# user may override these, via cmdline
#
@@ -2720,7 +2724,8 @@ setup_export() {
PTXDIST_OUTPUT_SYNC \
PTXDIST_PEDANTIC \
PTXDIST_QUIET \
- PTXDIST_VERBOSE
+ PTXDIST_VERBOSE \
+ PTXDIST_STDERR_REDIRECT
}
diff --git a/scripts/lib/ptxd_make_world_compile.sh b/scripts/lib/ptxd_make_world_compile.sh
index 9cc739e..cbaf355 100644
--- a/scripts/lib/ptxd_make_world_compile.sh
+++ b/scripts/lib/ptxd_make_world_compile.sh
@@ -11,6 +11,8 @@
# call the compiler
#
ptxd_make_world_compile() {
+
+ ( exec 2>&${PTXDIST_STDERR_REDIRECT}
ptxd_make_world_init &&
if [ -z "${pkg_build_dir}" ]; then
@@ -28,7 +30,7 @@ ptxd_make_world_compile() {
"${ptx_build_python}" \
setup.py \
"${pkg_make_opt}"
- ) 2>&1
+ )
;;
meson)
ptxd_eval \
@@ -37,7 +39,7 @@ ptxd_make_world_compile() {
"${pkg_make_env}" \
ninja -C "${pkg_build_dir}" \
"${pkg_make_opt}" \
- "${pkg_make_par}" 2>&1
+ "${pkg_make_par}"
;;
*)
ptxd_eval \
@@ -46,8 +48,8 @@ ptxd_make_world_compile() {
"${pkg_make_env}" \
"${MAKE}" -C "${pkg_build_dir}" \
"${pkg_make_opt}" \
- "${pkg_make_par}" 2>&1
+ "${pkg_make_par}"
;;
- esac
+ esac )
}
export -f ptxd_make_world_compile
--
1.9.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 2/3] host-qt4: Enable openssl
2017-05-20 2:16 ` [ptxdist] [PATCH 2/3] host-qt4: Enable openssl jon
@ 2017-05-24 9:29 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2017-05-24 9:29 UTC (permalink / raw)
To: ptxdist
On Fri, May 19, 2017 at 10:16:19PM -0400, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
>
> The build breaks if with a bunch of QSslSocket errors such as:
>
> undefined reference to `QSslSocket::staticMetaObject'
Can you elaborate? I what exactly are you doing when you get this error? I
don't see it here.
Michael
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
> rules/host-qt4.in | 1 +
> rules/host-qt4.make | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/rules/host-qt4.in b/rules/host-qt4.in
> index 1be8b4d..27503ac 100644
> --- a/rules/host-qt4.in
> +++ b/rules/host-qt4.in
> @@ -2,6 +2,7 @@
>
> config HOST_QT4
> tristate
> + select HOST_OPENSSL
> select HOST_DBUS if HOST_QT4_DBUS
> default ALLYES
>
> diff --git a/rules/host-qt4.make b/rules/host-qt4.make
> index 6e1b651..66fac05 100644
> --- a/rules/host-qt4.make
> +++ b/rules/host-qt4.make
> @@ -69,7 +69,6 @@ HOST_QT4_AUTOCONF := \
> -no-libtiff \
> -no-gif \
> -no-libjpeg \
> - -no-openssl \
> -qt-zlib \
> -no-freetype \
> -stl \
> --
> 1.9.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0
2017-05-20 2:16 [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 jon
2017-05-20 2:16 ` [ptxdist] [PATCH 2/3] host-qt4: Enable openssl jon
2017-05-20 2:16 ` [ptxdist] [PATCH 3/3] ptxd_make_world_compile.sh: conditionally redirect stderr>stdout jon
@ 2017-05-24 14:06 ` Michael Olbrich
2 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2017-05-24 14:06 UTC (permalink / raw)
To: ptxdist
On Fri, May 19, 2017 at 10:16:18PM -0400, jon@ringle.org wrote:
> From: Jon Ringle <jringle@gridpoint.com>
./scripts/configure_helper.py --pkg f2fs-tools
--- rules/f2fs-tools.make
+++ f2fs-tools-1.8.0
@@ -4,3 +4,4 @@
--libdir=/usr/lib
--build=x86_64-host-linux-gnu
--host=arm-v7a-linux-gnueabihf
+ --without-selinux
We have a global option for this. Look at how openssh handles the same
configure argument.
Michael
>
> Signed-off-by: Jon Ringle <jringle@gridpoint.com>
> ---
> patches/f2fs-tools-1.6.1/autogen.sh | 1 -
> patches/f2fs-tools-1.8.0/autogen.sh | 1 +
> rules/f2fs-tools.make | 4 ++--
> 3 files changed, 3 insertions(+), 3 deletions(-)
> delete mode 120000 patches/f2fs-tools-1.6.1/autogen.sh
> create mode 120000 patches/f2fs-tools-1.8.0/autogen.sh
>
> diff --git a/patches/f2fs-tools-1.6.1/autogen.sh b/patches/f2fs-tools-1.6.1/autogen.sh
> deleted file mode 120000
> index 9f8a4cb..0000000
> --- a/patches/f2fs-tools-1.6.1/autogen.sh
> +++ /dev/null
> @@ -1 +0,0 @@
> -../autogen.sh
> \ No newline at end of file
> diff --git a/patches/f2fs-tools-1.8.0/autogen.sh b/patches/f2fs-tools-1.8.0/autogen.sh
> new file mode 120000
> index 0000000..9f8a4cb
> --- /dev/null
> +++ b/patches/f2fs-tools-1.8.0/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/f2fs-tools.make b/rules/f2fs-tools.make
> index 1aa8675..756b159 100644
> --- a/rules/f2fs-tools.make
> +++ b/rules/f2fs-tools.make
> @@ -18,8 +18,8 @@ endif
> #
> # Paths and names
> #
> -F2FS_TOOLS_VERSION := 1.6.1
> -F2FS_TOOLS_MD5 := f4fe0b59ffef1eef71c20d12381a3054
> +F2FS_TOOLS_VERSION := 1.8.0
> +F2FS_TOOLS_MD5 := d4132ab388d30da729cb270aeac32bf1
> F2FS_TOOLS := f2fs-tools-$(F2FS_TOOLS_VERSION)
> F2FS_TOOLS_SUFFIX := tar.xz
> F2FS_TOOLS_URL := git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git;tag=v$(F2FS_TOOLS_VERSION)
> --
> 1.9.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-24 14:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-20 2:16 [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 jon
2017-05-20 2:16 ` [ptxdist] [PATCH 2/3] host-qt4: Enable openssl jon
2017-05-24 9:29 ` Michael Olbrich
2017-05-20 2:16 ` [ptxdist] [PATCH 3/3] ptxd_make_world_compile.sh: conditionally redirect stderr>stdout jon
2017-05-24 14:06 ` [ptxdist] [PATCH 1/3] f2fs-tools: version bump 1.6.1 -> 1.8.0 Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox