diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-06-04 11:10:32 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-06-04 11:10:32 +0400 |
| commit | 49aafba8e0eaffb05286bb739bef0587319643cd (patch) | |
| tree | 896d6496db063647c49ae16143ddc7e4b2d88e4f | |
| parent | 6a1588c29d67f07e6cd3a90fb62d610c5bf00c25 (diff) | |
| download | mesa-49aafba8e0eaffb05286bb739bef0587319643cd.tar.gz | |
ksh breaks build
| -rw-r--r-- | debian/patches/dyson-ksh-breaks-libtool.patch | 27 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/debian/patches/dyson-ksh-breaks-libtool.patch b/debian/patches/dyson-ksh-breaks-libtool.patch new file mode 100644 index 0000000000..625f8d5576 --- /dev/null +++ b/debian/patches/dyson-ksh-breaks-libtool.patch @@ -0,0 +1,27 @@ +Description: use bash + +libtool: unknown tag CXX + +and: + +/usr/bin/ksh93 ../../../libtool --tag=CC --mode=link gcc -fvisibility=hidden -g -O2 -Wall -Wall -std=c99 -Werror=implicit-function-declaration -Werror=missing-prototypes -fno-strict-aliasing -fno-builtin-memcmp -version-number 1:1 -no-undefined -o libGLESv1_CM.la -rpath /usr/lib/x86_64-illumos entry.lo -ldrm -lm -lpthread ../shared-glapi/libglapi.la +libtool: link: gcc -shared -fPIC -DPIC .libs/entry.o -Wl,-rpath -Wl,FOO/build/dri/src/mapi/.libs -Wl,-rpath -Wl,/usr/lib/x86_64-illumos -ldrm -lm -lpthread ../shared-glapi/.libs/libglapi.so -O2 -pthreads -Wl,-soname -Wl,libGLESv1_CM.so.1 -o .libs/libGLESv1_CM.so.1.1.0 +libtool: link: (cd ".libs" && rm -f "libGLESv1_CM.so.1" && ln -s "libGLESv1_CM.so.1.1.0" "libGLESv1_CM.so.1") +libtool: link: (cd ".libs" && rm -f "libGLESv1_CM.so" && ln -s "libGLESv1_CM.so.1.1.0" "libGLESv1_CM.so") +/usr/bin/sed: can't read FOO/build/dri/src/mapi/libglapi.la: No such file or directory +libtool: link: `FOO/build/dri/src/mapi/libglapi.la' is not a valid libtool archive +gmake[5]: *** [libGLESv1_CM.la] Error 1 + +Index: mesa/configure.ac +=================================================================== +--- mesa.orig/configure.ac 2014-06-04 10:49:26.794676610 +0400 ++++ mesa/configure.ac 2014-06-04 10:49:27.130228366 +0400 +@@ -88,7 +88,7 @@ + case "$host_os" in + solaris*) + # Solaris /bin/sh is too old/non-POSIX compliant +- AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh]) ++ AC_PATH_PROGS(POSIX_SHELL, [bash ksh93 ksh sh]) + SHELL="$POSIX_SHELL" + ;; + esac diff --git a/debian/patches/series b/debian/patches/series index 339c873e2b..8616c10fdd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 07_gallium-fix-build-failure-on-powerpcspe.diff dyson-use-system-extensions.patch dyson-newlocale.patch +dyson-ksh-breaks-libtool.patch |