Linaro GCC

Merge lp:~michaelh1/gcc-linaro/4.4-dev into lp:gcc-linaro/4.4

  1. 4.4-dev
  2. Merge into 4.4
Proposed by Michael Hope
Status: Merged
Approved by: Andrew Stubbs
Approved revision: no longer in the source branch.
Merged at revision: 93538
Proposed branch: lp:~michaelh1/gcc-linaro/4.4-dev
Merge into: lp:gcc-linaro/4.4
Diff against target: 56 lines (+11/-16)
3 files modified
ChangeLog.linaro (+6/-0)
libjava/Makefile.am (+3/-8)
libjava/Makefile.in (+2/-8)
To merge this branch: bzr merge lp:~michaelh1/gcc-linaro/4.4-dev
Reviewer Review Type Date Requested Status
Andrew Stubbs (community) Approve
Review via email: mp+29773@code.launchpad.net

Description of the change

r93536 and r93537 revert the CSL changes to the jar and pkgconfig directories.

To post a comment you must log in.
Revision history for this message
Andrew Stubbs (ams-codesourcery) wrote :

Ok, this seems fine. I'll do the merge myself so it doesn't interfere with the release.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog.linaro'
2--- ChangeLog.linaro 2010-07-09 11:47:12 +0000
3+++ ChangeLog.linaro 2010-07-13 08:57:54 +0000
4@@ -1,3 +1,9 @@
5+2010-07-13 Michael Hope <michael.hope@linaro.org>
6+
7+ * libjava/Makefile.am (pkgconfigdir): Reverted changes to pkgconfigdir and
8+ jardir back to the FSF version.
9+ * libjava/Makefile.in (jardir): Likewise.
10+
11 2010-07-09 Andrew Stubbs <ams@codesourcery.com>
12
13 gcc/
14
15=== modified file 'libjava/Makefile.am'
16--- libjava/Makefile.am 2010-06-17 08:44:15 +0000
17+++ libjava/Makefile.am 2010-07-13 08:57:54 +0000
18@@ -55,14 +55,9 @@
19
20 dbexec_LTLIBRARIES = libjvm.la
21
22-# Install the pkgconfig file in a target-specific directory, since the
23-# libraries it indicates
24-
25-pkgconfigdir = $(toolexeclibdir)/pkgconfig
26-
27-# We install the JAR in a target-specific directory so that toolchains
28-# build from different sources can be installed in the same directory.
29-jardir = $(prefix)/$(target_noncanonical)/share/java
30+pkgconfigdir = $(libdir)/pkgconfig
31+
32+jardir = $(datadir)/java
33 jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
34 if INSTALL_ECJ_JAR
35 jar_DATA += $(ECJ_BUILD_JAR)
36
37=== modified file 'libjava/Makefile.in'
38--- libjava/Makefile.in 2010-06-17 08:44:15 +0000
39+++ libjava/Makefile.in 2010-07-13 08:57:54 +0000
40@@ -915,14 +915,8 @@
41 $(am__append_2) $(am__append_3)
42 toolexecmainlib_DATA = libgcj.spec
43 dbexec_LTLIBRARIES = libjvm.la
44-
45-# Install the pkgconfig file in a target-specific directory, since the
46-# libraries it indicates
47-pkgconfigdir = $(toolexeclibdir)/pkgconfig
48-
49-# We install the JAR in a target-specific directory so that toolchains
50-# build from different sources can be installed in the same directory.
51-jardir = $(prefix)/$(target_noncanonical)/share/java
52+pkgconfigdir = $(libdir)/pkgconfig
53+jardir = $(datadir)/java
54 jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
55 $(am__append_4)
56 @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)

Subscribers

People subscribed via source and target branches