* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
@ 2008-04-24 16:48 ninevoltz at uclibc.org
2008-04-24 17:43 ` Peter Korsgaard
2008-04-24 21:21 ` Bernhard Fischer
0 siblings, 2 replies; 9+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-24 16:48 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-24 09:48:20 -0700 (Thu, 24 Apr 2008)
New Revision: 21845
Log:
bump to 0.97.1, removed patch as it has been already applied in upstream revision 0.97.0 (http://gcc.gnu.org/bugzilla/buglist.cgi?product=classpath&target_milestone=0.97)
also fix change in package path that prevented patches from being applied
Removed:
trunk/buildroot/package/java/classpath/classpath-avr32-endianness.patch
Modified:
trunk/buildroot/package/java/classpath/classpath.mk
trunk/buildroot/package/java/concierge/concierge.mk
trunk/buildroot/package/java/jamvm/jamvm.mk
Changeset:
Deleted: trunk/buildroot/package/java/classpath/classpath-avr32-endianness.patch
===================================================================
--- trunk/buildroot/package/java/classpath/classpath-avr32-endianness.patch 2008-04-24 14:26:48 UTC (rev 21844)
+++ trunk/buildroot/package/java/classpath/classpath-avr32-endianness.patch 2008-04-24 16:48:20 UTC (rev 21845)
@@ -1,29 +0,0 @@
-diff -rup ../classpath-0.96.1.default/ChangeLog ./ChangeLog
---- ../classpath-0.96.1.default/ChangeLog 2007-10-16 17:35:33.000000000
-+0200
-+++ ./ChangeLog 2007-12-18 09:36:39.000000000 +0100
-@@ -1,3 +1,7 @@
-+2007-12-18 Leen Toelen <toelen@gmail.com>
-+
-+ * native/fdlibm/ieeefp.h: Added avr32 support
-+
- 2007-10-16 Mark Wielaard <mark@klomp.org>
-
- * NEWS: Mention small compile/configure/build fixes.
-diff -rup ../classpath-0.96.1.default/native/fdlibm/ieeefp.h
-./native/fdlibm/ieeefp.h
---- ../classpath-0.96.1.default/native/fdlibm/ieeefp.h 2006-04-19
-19:55:13.000000000 +0200
-+++ ./native/fdlibm/ieeefp.h 2007-12-18 09:32:55.000000000 +0100
-@@ -87,6 +87,10 @@
- #define __IEEE_LITTLE_ENDIAN
- #endif
-
-+#ifdef __AVR32__
-+#define __IEEE_BIG_ENDIAN
-+#endif
-+
- #ifdef __MIPSEL__
- #define __IEEE_LITTLE_ENDIAN
- #endif
-
Modified: trunk/buildroot/package/java/classpath/classpath.mk
===================================================================
--- trunk/buildroot/package/java/classpath/classpath.mk 2008-04-24 14:26:48 UTC (rev 21844)
+++ trunk/buildroot/package/java/classpath/classpath.mk 2008-04-24 16:48:20 UTC (rev 21845)
@@ -3,14 +3,15 @@
# classpath 0.96.1
#
#############################################################
-CLASSPATH_VERSION = 0.96.1
+CLASSPATH_VERSION = 0.97.1
CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz
CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
CLASSPATH_AUTORECONF = NO
CLASSPATH_INSTALL_STAGING = YES
CLASSPATH_INSTALL_TARGET = YES
CLASSPATH_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
-CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+CLASSPATH_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+CLASSPATH_DIR_PREFIX = package/java
CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -91,4 +92,4 @@
-$(eval $(call AUTOTARGETS,package,classpath))
+$(eval $(call AUTOTARGETS,package/java,classpath))
Modified: trunk/buildroot/package/java/concierge/concierge.mk
===================================================================
--- trunk/buildroot/package/java/concierge/concierge.mk 2008-04-24 14:26:48 UTC (rev 21844)
+++ trunk/buildroot/package/java/concierge/concierge.mk 2008-04-24 16:48:20 UTC (rev 21845)
@@ -10,19 +10,20 @@
CONCIERGE_SITE_BUNDLES = http://concierge.sourceforge.net/bundles/
$(DL_DIR)/concierge:
- mkdir -p $(DL_DIR)/concierge/
- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
+ mkdir -p $(DL_DIR)/concierge/
+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
$(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge
+ mkdir -p $(TARGET_DIR)/usr/lib
mkdir -p $(TARGET_DIR)/usr/lib/concierge
cp -dpf $(DL_DIR)/concierge/* $(TARGET_DIR)/usr/lib/concierge/
cp -dpf package/concierge/files/init.xargs $(TARGET_DIR)/usr/lib/concierge/
touch -c $@
-$(TARGET_DIR)/usr/bin/concierge:
+$(TARGET_DIR)/usr/bin/concierge:
cp -dpf package/concierge/files/concierge $(TARGET_DIR)/usr/bin/
chmod +x $(TARGET_DIR)/usr/bin/concierge
touch -c $@
Modified: trunk/buildroot/package/java/jamvm/jamvm.mk
===================================================================
--- trunk/buildroot/package/java/jamvm/jamvm.mk 2008-04-24 14:26:48 UTC (rev 21844)
+++ trunk/buildroot/package/java/jamvm/jamvm.mk 2008-04-24 16:48:20 UTC (rev 21845)
@@ -11,6 +11,7 @@
JAMVM_INSTALL_TARGET = YES
JAMVM_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
JAMVM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+JAMVM_DIR_PREFIX = package/java
JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \
@@ -102,4 +103,4 @@
CC="$(STAGING_DIR)/usr/bin/avr32-linux-gcc"
endif
-$(eval $(call AUTOTARGETS,package,jamvm))
+$(eval $(call AUTOTARGETS,package/java,jamvm))
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 16:48 [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm ninevoltz at uclibc.org
@ 2008-04-24 17:43 ` Peter Korsgaard
2008-04-24 18:11 ` John Voltz
2008-04-24 21:21 ` Bernhard Fischer
1 sibling, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2008-04-24 17:43 UTC (permalink / raw)
To: buildroot
>>>>> "ninevoltz" == ninevoltz <ninevoltz@uclibc.org> writes:
Hi,
ninevoltz> Author: ninevoltz
ninevoltz> Date: 2008-04-24 09:48:20 -0700 (Thu, 24 Apr 2008)
ninevoltz> New Revision: 21845
ninevoltz> Log:
ninevoltz> bump to 0.97.1, removed patch as it has been already applied in upstream revision 0.97.0 (http://gcc.gnu.org/bugzilla/buglist.cgi?product=classpath&target_milestone=0.97)
ninevoltz> also fix change in package path that prevented patches from being applied
Thanks.
ninevoltz> +JAMVM_DIR_PREFIX = package/java
ninevoltz> -$(eval $(call AUTOTARGETS,package,jamvm))
ninevoltz> +$(eval $(call AUTOTARGETS,package/java,jamvm))
Wouldn't it make sense for <package>_DIR_PREFIX to default to the 1st
argument of AUTOTARGETS?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 17:43 ` Peter Korsgaard
@ 2008-04-24 18:11 ` John Voltz
2008-04-24 18:21 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: John Voltz @ 2008-04-24 18:11 UTC (permalink / raw)
To: buildroot
I don't even see where JAMVM_DIR_PREFIX is being used at all. I'm removing
it.
John
On Thu, Apr 24, 2008 at 1:43 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "ninevoltz" == ninevoltz <ninevoltz@uclibc.org> writes:
>
> Hi,
>
> ninevoltz> Author: ninevoltz
> ninevoltz> Date: 2008-04-24 09:48:20 -0700 (Thu, 24 Apr 2008)
> ninevoltz> New Revision: 21845
>
> ninevoltz> Log:
> ninevoltz> bump to 0.97.1, removed patch as it has been already applied in
> upstream revision 0.97.0 (
> http://gcc.gnu.org/bugzilla/buglist.cgi?product=classpath&target_milestone=0.97
> )
> ninevoltz> also fix change in package path that prevented patches from
> being applied
>
> Thanks.
>
> ninevoltz> +JAMVM_DIR_PREFIX = package/java
>
> ninevoltz> -$(eval $(call AUTOTARGETS,package,jamvm))
> ninevoltz> +$(eval $(call AUTOTARGETS,package/java,jamvm))
>
> Wouldn't it make sense for <package>_DIR_PREFIX to default to the 1st
> argument of AUTOTARGETS?
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080424/a907fa81/attachment.htm
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 18:11 ` John Voltz
@ 2008-04-24 18:21 ` Peter Korsgaard
2008-04-24 18:34 ` John Voltz
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2008-04-24 18:21 UTC (permalink / raw)
To: buildroot
>>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
John> I don't even see where JAMVM_DIR_PREFIX is being used at
John> all. I'm removing it.
It seems to be used in Makfile.autotools.in ($(PKG)_DIR_PREFIX) for
finding the patches, so you better not.
Does it apply the avr32 patch if you leave it out?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 18:21 ` Peter Korsgaard
@ 2008-04-24 18:34 ` John Voltz
2008-04-24 18:58 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: John Voltz @ 2008-04-24 18:34 UTC (permalink / raw)
To: buildroot
Makefile.autotools.in will use the first argument of call AUTOTARGETS, look
around line 161. I've never used <pkg>_DIR_PREFIX in any of the makefiles
I've created and it works in festival this way, even with the multiple
sub-directories.
John
On Thu, Apr 24, 2008 at 2:21 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
>
> John> I don't even see where JAMVM_DIR_PREFIX is being used at
> John> all. I'm removing it.
>
> It seems to be used in Makfile.autotools.in ($(PKG)_DIR_PREFIX) for
> finding the patches, so you better not.
>
> Does it apply the avr32 patch if you leave it out?
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080424/e01130d9/attachment.htm
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 18:34 ` John Voltz
@ 2008-04-24 18:58 ` Peter Korsgaard
2008-04-24 19:13 ` John Voltz
2008-04-24 20:18 ` Thiago A. Corrêa
0 siblings, 2 replies; 9+ messages in thread
From: Peter Korsgaard @ 2008-04-24 18:58 UTC (permalink / raw)
To: buildroot
>>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
John> Makefile.autotools.in will use the first argument of call
John> AUTOTARGETS, look around line 161. I've never used
John> <pkg>_DIR_PREFIX in any of the makefiles I've created and it
John> works in festival this way, even with the multiple
John> sub-directories.
Ok, so why did you add it to classpath and jamvm?
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 18:58 ` Peter Korsgaard
@ 2008-04-24 19:13 ` John Voltz
2008-04-24 20:18 ` Thiago A. Corrêa
1 sibling, 0 replies; 9+ messages in thread
From: John Voltz @ 2008-04-24 19:13 UTC (permalink / raw)
To: buildroot
I didn't :) I don't even know who the originator was for the whole
java/jam/classpath/concierge collection. I know there were several people
involved, but as far as the actual commit in the Google Code svn, it was
Thiago Correa.
John
On Thu, Apr 24, 2008 at 2:58 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
>
> John> Makefile.autotools.in will use the first argument of call
> John> AUTOTARGETS, look around line 161. I've never used
> John> <pkg>_DIR_PREFIX in any of the makefiles I've created and it
> John> works in festival this way, even with the multiple
> John> sub-directories.
>
> Ok, so why did you add it to classpath and jamvm?
>
> --
> Bye, Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://busybox.net/lists/buildroot/attachments/20080424/6a59c675/attachment.htm
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 18:58 ` Peter Korsgaard
2008-04-24 19:13 ` John Voltz
@ 2008-04-24 20:18 ` Thiago A. Corrêa
1 sibling, 0 replies; 9+ messages in thread
From: Thiago A. Corrêa @ 2008-04-24 20:18 UTC (permalink / raw)
To: buildroot
The commit that change the makefile was previous to the one updating
the package version, back then, just setting the <pkg>_DIR_PREFIX
wasn't enough to get the patch applied.
I had to do some trial and error to get it to work, and that's the
only way it has *smile*.
On Thu, Apr 24, 2008 at 3:58 PM, Peter Korsgaard <jacmet@uclibc.org> wrote:
> >>>>> "John" == John Voltz <john.voltz@gmail.com> writes:
>
> John> Makefile.autotools.in will use the first argument of call
> John> AUTOTARGETS, look around line 161. I've never used
> John> <pkg>_DIR_PREFIX in any of the makefiles I've created and it
> John> works in festival this way, even with the multiple
> John> sub-directories.
>
> Ok, so why did you add it to classpath and jamvm?
>
>
>
> --
> Bye, Peter Korsgaard
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm
2008-04-24 16:48 [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm ninevoltz at uclibc.org
2008-04-24 17:43 ` Peter Korsgaard
@ 2008-04-24 21:21 ` Bernhard Fischer
1 sibling, 0 replies; 9+ messages in thread
From: Bernhard Fischer @ 2008-04-24 21:21 UTC (permalink / raw)
To: buildroot
On Thu, Apr 24, 2008 at 09:48:21AM -0700, ninevoltz at uclibc.org wrote:
>Author: ninevoltz
>Date: 2008-04-24 09:48:20 -0700 (Thu, 24 Apr 2008)
>New Revision: 21845
>
>Log:
>bump to 0.97.1, removed patch as it has been already applied in upstream revision 0.97.0 (http://gcc.gnu.org/bugzilla/buglist.cgi?product=classpath&target_milestone=0.97)
>also fix change in package path that prevented patches from being applied
>
>Removed:
> trunk/buildroot/package/java/classpath/classpath-avr32-endianness.patch
>
>Modified:
> trunk/buildroot/package/java/classpath/classpath.mk
> trunk/buildroot/package/java/concierge/concierge.mk
> trunk/buildroot/package/java/jamvm/jamvm.mk
>
>
>Changeset:
>Deleted: trunk/buildroot/package/java/classpath/classpath-avr32-endianness.patch
>Modified: trunk/buildroot/package/java/concierge/concierge.mk
>===================================================================
>--- trunk/buildroot/package/java/concierge/concierge.mk 2008-04-24 14:26:48 UTC (rev 21844)
>+++ trunk/buildroot/package/java/concierge/concierge.mk 2008-04-24 16:48:20 UTC (rev 21845)
>@@ -10,19 +10,20 @@
> CONCIERGE_SITE_BUNDLES = http://concierge.sourceforge.net/bundles/
>
> $(DL_DIR)/concierge:
>- mkdir -p $(DL_DIR)/concierge/
>- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
>- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
>- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
>- $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
>+ mkdir -p $(DL_DIR)/concierge/
Wow, now that's really broken, but ok, we can top that for sure
>+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE)/concierge-$(CONCIERGE_VERSION).jar
>+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)shell-1.0.0.RC2.jar
>+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)service-tracker-1.0.0.RC2.jar
>+ $(WGET) -P $(DL_DIR)/concierge/ $(CONCIERGE_SITE_BUNDLES)event-admin-1.0.0.RC2.jar
>
> $(TARGET_DIR)/usr/lib/concierge/: $(DL_DIR)/concierge
alright, that tops it.
>+ mkdir -p $(TARGET_DIR)/usr/lib
> mkdir -p $(TARGET_DIR)/usr/lib/concierge
oh yes.
> cp -dpf $(DL_DIR)/concierge/* $(TARGET_DIR)/usr/lib/concierge/
> cp -dpf package/concierge/files/init.xargs $(TARGET_DIR)/usr/lib/concierge/
> touch -c $@
>
>-$(TARGET_DIR)/usr/bin/concierge:
>+$(TARGET_DIR)/usr/bin/concierge:
> cp -dpf package/concierge/files/concierge $(TARGET_DIR)/usr/bin/
> chmod +x $(TARGET_DIR)/usr/bin/concierge
> touch -c $@
wow. My favourite by now still is the "mkdir -p", but not using
$(INSTALL) -m0775 -D here is just about as good.
Hard to decide what hunk deserves the attribute of
most-misguided-and-nonsensical hunk of this revision. Let's just wait
for the next one :(
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2008-04-24 21:21 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-24 16:48 [Buildroot] svn commit: trunk/buildroot/package/java: classpath concierge jamvm ninevoltz at uclibc.org
2008-04-24 17:43 ` Peter Korsgaard
2008-04-24 18:11 ` John Voltz
2008-04-24 18:21 ` Peter Korsgaard
2008-04-24 18:34 ` John Voltz
2008-04-24 18:58 ` Peter Korsgaard
2008-04-24 19:13 ` John Voltz
2008-04-24 20:18 ` Thiago A. Corrêa
2008-04-24 21:21 ` Bernhard Fischer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox