rpms/eclipse-cdt/devel eclipse-cdt-ppc64-add_ldflags.patch, NONE, 1.1 eclipse-cdt-ppc64-add_xopen_source-include.patch, NONE, 1.1 eclipse-cdt.spec, 1.133, 1.134

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16534

Modified Files:
	eclipse-cdt.spec 
Added Files:
	eclipse-cdt-ppc64-add_ldflags.patch 
	eclipse-cdt-ppc64-add_xopen_source-include.patch 
Log Message:
* Mon Oct 05 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-11
- Build on ppc64

eclipse-cdt-ppc64-add_ldflags.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE eclipse-cdt-ppc64-add_ldflags.patch ---
Add LDFLAGS variable to the lines that create the shared objects.

Extra link options are needed on some platforms, such as ppc64, where a
-m64 switch is needed.
Index: library/Makefile
===================================================================
--- library.orig/Makefile
+++ library/Makefile
@@ -33,11 +33,11 @@ rebuild: clean all
 
 $(LIB_NAME_FULL_SPAWNER) : $(OBJS_SPAWNER)
 	mkdir -p $(INSTALL_DIR)
-	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_SPAWNER) -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc
+	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_SPAWNER) $(LDFLAGS) -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc
 
 $(LIB_NAME_FULL_PTY): $(OBJS_PTY)
 	mkdir -p $(INSTALL_DIR)
-	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_PTY) -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY)
+	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_PTY) $(LDFLAGS) -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY)
 
 clean :
 	$(RM) $(OBJS_SPAWNER) $(LIB_NAME_FULL_SPAWNER)

eclipse-cdt-ppc64-add_xopen_source-include.patch:
 openpty.c |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE eclipse-cdt-ppc64-add_xopen_source-include.patch ---
#define of _XOPEN_SOURCE is needed to obtain the header for ptsname.

if _XOPEN_SOURCE is not defined before including stdlib.h, a warning about
a assignment from an integer to a pointer without a cast will occur.  This
warning could actually cause problems in some circumstances, because the
upper bits of the return value could, potentially, bet set to zero before
the assignment is made.
Index: library/openpty.c
===================================================================
--- library.orig/openpty.c
+++ library/openpty.c
@@ -8,6 +8,10 @@
  * Contributors:
  *     QNX Software Systems - initial API and implementation
  *******************************************************************************/
+
+
+/* _XOPEN_SOURCE is needed to bring in the header for ptsname */
+#define _XOPEN_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
@@ -20,6 +24,7 @@
 #include <grp.h>
 
 #include <stdlib.h>
+
 #include <stropts.h>
 
 /**


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- eclipse-cdt.spec	24 Sep 2009 22:20:05 -0000	1.133
+++ eclipse-cdt.spec	5 Oct 2009 15:11:44 -0000	1.134
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -73,6 +73,7 @@ Source7: libstdc++-v3.libhover
 
 # Remove include of stropts.h in openpty.c as it is no longer included 
 # in glibc-headers package
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272373
 Patch12: %{name}-openpty.patch
 
 # Add XML -> HTML generation after running tests
@@ -86,6 +87,17 @@ Patch14: %{name}-libhover-local.patch
 # and to enable local plugin file support for docs.
 Patch15: %{name}-libhover.patch
 
+# Patches for ppc64
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380
+
+# Add LDFLAGS to Makefile for .so
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272364
+Patch16: %{name}-ppc64-add_ldflags.patch
+
+# Add define of _XOPEN_SOURCE so that ptsname header is included
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
+Patch17: %{name}-ppc64-add_xopen_source-include.patch
+
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
@@ -99,8 +111,7 @@ Requires:       gdb make gcc-c++ autocon
 Requires:       eclipse-platform >= 1:3.5.0
 Requires:	eclipse-rse >= 3.0
 
-# Currently, upstream CDT only supports building on the platforms listed here.
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 %description
@@ -229,6 +240,20 @@ find -name \*.so | xargs rm -rf
 mv org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.BAK \
   org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.tests/resources/testlib/x86/so.g/libtestlib_g.so
 
+%ifarch ppc64
+pushd org.eclipse.cdt.releng/results/plugins
+echo "fragmentName.linux.%{eclipse_arch} = C/C++ Development Tools Core for Linux (%{eclipse_arch})" \
+  >> org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core/plugin.properties
+cp -rp org.eclipse.cdt.core.linux.{x86,%{eclipse_arch}}
+cd org.eclipse.cdt.core.linux.%{eclipse_arch}
+sed -i "s/x86/%{eclipse_arch}/" META-INF/MANIFEST.MF
+mv os/linux/{x86,%{eclipse_arch}}
+cd ../org.eclipse.cdt.core.linux
+%patch16 -p0
+%patch17 -p0
+popd
+%endif
+
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
@@ -522,6 +547,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Mon Oct 05 2009 Andrew Overholt <overholt at redhat.com> 1:6.0.0-11
+- Build on ppc64
+
 * Wed Sep 23 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.0-10
 - Resolves #290247
 - Upgrade libhover to 0.3.0.