Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/gtk')
-rwxr-xr-x[-rw-r--r--]features/org.eclipse.equinox.executable.feature/library/gtk/build.sh7
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak2
2 files changed, 8 insertions, 1 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
index 19ac6ec0b..6cd9ca86e 100644..100755
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
@@ -10,6 +10,7 @@
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
# Martin Oberhuber (Wind River) - [176805] Support building with gcc and debug
+# Martin Oberhuber (Wind River) - [517013] Avoid memcpy@GLIBC_2.14 dependency
#*******************************************************************************
#
# Usage: sh build.sh [<optional switches>] [clean]
@@ -253,6 +254,12 @@ elif [ "$defaultOS" = "solaris" ]; then
M_ARCH=-m64
export M_ARCH
fi
+elif [ "$defaultOS" = "linux" ]; then
+ if [ "$defaultOSArch" = "x86_64" ]; then
+ # Bug 517013: Avoid using memcpy() to remain compatible with older glibc
+ M_CFLAGS="-fno-builtin-memcpy -fno-builtin-memmove"
+ export M_CFLAGS
+ fi
fi
LIBRARY_DIR="$EXEC_DIR/../org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
index 6abe01702..e20823478 100644
--- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
+++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak
@@ -48,7 +48,7 @@ GTK_LIBS = \
-DGTK3_LIB="\"libgtk-3.so.0\"" -DGDK3_LIB="\"libgdk-3.so.0\"" \
-DPIXBUF_LIB="\"libgdk_pixbuf-2.0.so.0\"" -DGOBJ_LIB="\"libgobject-2.0.so.0\"" -DX11_LIB="\"libX11.so.6\""
LFLAGS = ${M_ARCH} -shared -fpic -Wl,--export-dynamic
-CFLAGS = ${M_ARCH} -g -s -Wall\
+CFLAGS = ${M_CFLAGS} ${M_ARCH} -g -s -Wall\
-fpic \
-DLINUX \
-DMOZILLA_FIX \

Back to the top