Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8143236: Update devkit creation makefiles for linux
authorerikj
Tue, 24 Nov 2015 11:25:16 +0100
changeset 34100 e3293031f83d
parent 34099 64da21aa58f6
child 34101 a1db3b482137
8143236: Update devkit creation makefiles for linux Reviewed-by: ihse
make/devkit/Makefile file | annotate | diff | comparison | revisions
make/devkit/Tools.gmk file | annotate | diff | comparison | revisions 
--- a/make/devkit/Makefile	Tue Nov 24 10:22:14 2015 +0100
+++ b/make/devkit/Makefile	Tue Nov 24 11:25:16 2015 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,12 +43,12 @@
 #
 # To build the full set of crosstools, use a command line looking like this:
 #
-# make tars RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
+# make tars RPM_DIR_x86_64=/tmp/oel64-x86_64/Packages/ RPM_DIR_i686=/tmp/oel64-i686/Packages/
 #
 # To create a x86_64 package without the redundant i686 cross compiler, do
 # like this:
 #
-# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
+# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel64-x86_64/Packages/ RPM_DIR_i686=/tmp/oel64-i686/Packages/
 
 #
 # Main makefile which iterates over all host and target platforms.
--- a/make/devkit/Tools.gmk	Tue Nov 24 10:22:14 2015 +0100
+++ b/make/devkit/Tools.gmk	Tue Nov 24 11:25:16 2015 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -63,11 +63,11 @@
 GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
 MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz
 
-# RPMs in OEL5.5
-LINUX_VERSION := OEL5.5
+# RPMs in OEL6.4
+LINUX_VERSION := OEL6.4
 RPM_LIST := \
     kernel-headers \
-    glibc-2 glibc-headers glibc-devel \
+    glibc glibc-headers glibc-devel \
     cups-libs cups-devel \
     libX11 libX11-devel \
     xorg-x11-proto-devel \
@@ -87,7 +87,7 @@
 
 ifeq ($(ARCH),x86_64)
   RPM_DIR ?= $(RPM_DIR_x86_64)
-  RPM_ARCHS := x86_64
+  RPM_ARCHS := x86_64 noarch
   ifeq ($(BUILD),$(HOST))
     ifeq ($(TARGET),$(HOST))
       # When building the native compiler for x86_64, enable mixed mode.
@@ -102,6 +102,8 @@
 # Sort to remove duplicates
 RPM_FILE_LIST := $(sort $(foreach a,$(RPM_ARCHS),$(wildcard $(patsubst %,$(RPM_DIR)/%*$a.rpm,$(RPM_LIST)))))
 
+#$(info RPM_FILE_LIST $(RPM_FILE_LIST))
+
 ifeq ($(RPM_FILE_LIST),)
   $(error Found no RPMs, RPM_DIR must point to list of directories to search for RPMs)
 endif
@@ -473,13 +475,25 @@
 
 ##########################################################################################
 
+ifeq ($(TARGET), $(HOST))
+  $(PREFIX)/bin/%:
+	@echo 'Creating missing $* soft link'
+	ln -s $(TARGET)-$* $@
+
+  missing-links := $(addprefix $(PREFIX)/bin/, \
+      addr2line ar as c++ c++filt elfedit g++ gcc gprof ld nm objcopy ranlib readelf \
+      size strings strip)
+endif
+
+##########################################################################################
+
 bfdlib : $(bfdlib)
 binutils : $(binutils)
 rpms : $(rpms)
 libs : $(libs)
 sysroot : rpms libs
 gcc : sysroot $(gcc) $(gccpatch)
-all : binutils gcc bfdlib $(PREFIX)/devkit.info
+all : binutils gcc bfdlib $(PREFIX)/devkit.info $(missing-links)
 
 # this is only built for host. so separate.
 ccache : $(ccache)
jdk-sandbox