All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] svn commit: trunk/buildroot/package/jpeg
@ 2007-10-13 23:08 ulf at uclibc.org
  2007-10-13 23:52 ` Cristian Ionescu-Idbohrn
  0 siblings, 1 reply; 7+ messages in thread
From: ulf at uclibc.org @ 2007-10-13 23:08 UTC (permalink / raw)
  To: buildroot

Author: ulf
Date: 2007-10-13 16:08:01 -0700 (Sat, 13 Oct 2007)
New Revision: 20245

Log:
Create dir before use in jpeg pkg

Modified:
   trunk/buildroot/package/jpeg/jpeg.mk


Changeset:
Modified: trunk/buildroot/package/jpeg/jpeg.mk
===================================================================
--- trunk/buildroot/package/jpeg/jpeg.mk	2007-10-13 23:07:04 UTC (rev 20244)
+++ trunk/buildroot/package/jpeg/jpeg.mk	2007-10-13 23:08:01 UTC (rev 20245)
@@ -73,6 +73,7 @@
 	touch -c $@
 
 $(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a
+	mkdir -p $(TARGET_DIR)/usr/lib
 	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so*
 	touch -c $@

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/jpeg
  2007-10-13 23:08 [Buildroot] svn commit: trunk/buildroot/package/jpeg ulf at uclibc.org
@ 2007-10-13 23:52 ` Cristian Ionescu-Idbohrn
  0 siblings, 0 replies; 7+ messages in thread
From: Cristian Ionescu-Idbohrn @ 2007-10-13 23:52 UTC (permalink / raw)
  To: buildroot

Build breaks :(

On Sat, 13 Oct 2007, ulf at uclibc.org wrote:

> Author: ulf
> Date: 2007-10-13 16:08:01 -0700 (Sat, 13 Oct 2007)
> New Revision: 20245
>
> Log:
> Create dir before use in jpeg pkg
>
> Modified:
>    trunk/buildroot/package/jpeg/jpeg.mk
>
>
> Changeset:
> Modified: trunk/buildroot/package/jpeg/jpeg.mk
> ===================================================================
> --- trunk/buildroot/package/jpeg/jpeg.mk	2007-10-13 23:07:04 UTC (rev 20244)
> +++ trunk/buildroot/package/jpeg/jpeg.mk	2007-10-13 23:08:01 UTC (rev 20245)
> @@ -73,6 +73,7 @@
>  	touch -c $@
>
>  $(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a
> +	mkdir -p $(TARGET_DIR)/usr/lib
>  	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
>  	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so*
>  	touch -c $@

.../build_i486/staging_dir/usr/bin/i486-linux-uclibc-gcc
-Os -pipe
-I.../build_i486/staging_dir/usr/include
-I.../build_i486/staging_dir/include
--sysroot=.../build_i486/staging_dir/ -isysroot
.../build_i486/staging_dir -mtune=i486
-march=i486 -o .libs/cjpeg cjpeg.o rdppm.o rdgif.o rdtarga.o rdrle.o
rdbmp.o rdswitch.o cdjpeg.o -Wl,--rpath -Wl,/lib .libs/libjpeg.so
.../build_i486/staging_dir//lib/libc.so.0:
undefined reference to `_dl_app_init_array'
.../build_i486/staging_dir//lib/libc.so.0:
undefined reference to `_dl_app_fini_array'
collect2: ld returned 1 exit status
make[1]: *** [cjpeg] Error 1
make[1]: Leaving directory
`.../build_i486/jpeg-6b'


Thanks,

-- 
Cristian

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/jpeg
  2008-03-06 18:14 ninevoltz at uclibc.org
@ 2008-03-06 23:56 ` Hamish Moffatt
  0 siblings, 0 replies; 7+ messages in thread
From: Hamish Moffatt @ 2008-03-06 23:56 UTC (permalink / raw)
  To: buildroot

On Thu, Mar 06, 2008 at 10:14:16AM -0800, ninevoltz at uclibc.org wrote:
> Author: ninevoltz
> Date: 2008-03-06 10:14:14 -0800 (Thu, 06 Mar 2008)
> New Revision: 21202
> 
> Log:
> fixed jpeg makefile

(Moved from /lib to /usr/lib.)

What does this fix?


Hamish
-- 
Hamish Moffatt VK3SB <hamish@debian.org> <hamish@cloud.net.au>

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/jpeg
@ 2008-03-06 18:14 ninevoltz at uclibc.org
  2008-03-06 23:56 ` Hamish Moffatt
  0 siblings, 1 reply; 7+ messages in thread
From: ninevoltz at uclibc.org @ 2008-03-06 18:14 UTC (permalink / raw)
  To: buildroot

Author: ninevoltz
Date: 2008-03-06 10:14:14 -0800 (Thu, 06 Mar 2008)
New Revision: 21202

Log:
fixed jpeg makefile

Modified:
   trunk/buildroot/package/jpeg/jpeg.mk


Changeset:
Modified: trunk/buildroot/package/jpeg/jpeg.mk
===================================================================
--- trunk/buildroot/package/jpeg/jpeg.mk	2008-03-06 18:13:45 UTC (rev 21201)
+++ trunk/buildroot/package/jpeg/jpeg.mk	2008-03-06 18:14:14 UTC (rev 21202)
@@ -49,7 +49,7 @@
 		--exec-prefix=/usr \
 		--bindir=/usr/bin \
 		--sbindir=/usr/sbin \
-		--libdir=/lib \
+		--libdir=/usr/lib \
 		--libexecdir=/usr/lib \
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
@@ -67,14 +67,15 @@
 	$(MAKE) -C $(JPEG_DIR) all
 	touch -c $@
 
-$(STAGING_DIR)/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(JPEG_DIR) install-headers install-lib
-	rm $(STAGING_DIR)/lib/libjpeg.la
+$(STAGING_DIR)/usr/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a
+	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(JPEG_DIR) install
+	cp -f $(JPEG_DIR)/libjpeg.la $(STAGING_DIR)/usr/lib
+	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libjpeg.la
 	touch -c $@
 
-$(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a
+$(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/usr/lib/libjpeg.a
 	mkdir -p $(TARGET_DIR)/usr/lib
-	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
+	cp -dpf $(STAGING_DIR)/usr/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
 	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so*
 	touch -c $@
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/jpeg
@ 2007-08-28 12:41 aldot at uclibc.org
  0 siblings, 0 replies; 7+ messages in thread
From: aldot at uclibc.org @ 2007-08-28 12:41 UTC (permalink / raw)
  To: buildroot

Author: aldot
Date: 2007-08-28 05:41:56 -0700 (Tue, 28 Aug 2007)
New Revision: 19712

Log:
- use correct include dir (Simon Pasch)
- cleanup while at it


Modified:
   trunk/buildroot/package/jpeg/jpeg.mk


Changeset:
Modified: trunk/buildroot/package/jpeg/jpeg.mk
===================================================================
--- trunk/buildroot/package/jpeg/jpeg.mk	2007-08-28 11:23:23 UTC (rev 19711)
+++ trunk/buildroot/package/jpeg/jpeg.mk	2007-08-28 12:41:56 UTC (rev 19712)
@@ -35,7 +35,7 @@
 	$(JPEG_CAT) $(DL_DIR)/$(JPEG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(JPEG_DIR) package/jpeg/ jpeg\*.patch
 	$(CONFIG_UPDATE) $(JPEG_DIR)
-	touch $(JPEG_DIR)/.unpacked
+	touch $@
 
 $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked
 	(cd $(JPEG_DIR); rm -rf config.cache; \
@@ -54,28 +54,28 @@
 		--sysconfdir=/etc \
 		--datadir=/usr/share \
 		--localstatedir=/var \
-		--includedir=/include \
+		--includedir=/usr/include \
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		--enable-shared \
 		--enable-static \
 		--without-x \
 	)
-	touch $(JPEG_DIR)/.configured
+	touch $@
 
 $(JPEG_DIR)/.libs/libjpeg.a: $(JPEG_DIR)/.configured
 	$(MAKE) -C $(JPEG_DIR) all
-	touch -c $(JPEG_DIR)/.libs/libjpeg.a
+	touch -c $@
 
 $(STAGING_DIR)/lib/libjpeg.a: $(JPEG_DIR)/.libs/libjpeg.a
 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(JPEG_DIR) install-headers install-lib
 	rm $(STAGING_DIR)/lib/libjpeg.la
-	touch -c $(STAGING_DIR)/lib/libjpeg.a
+	touch -c $@
 
 $(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a
 	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
 	-$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libjpeg.so*
-	touch -c $(TARGET_DIR)/usr/lib/libjpeg.so
+	touch -c $@
 
 jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/jpeg
@ 2007-01-11  7:25 andersen at uclibc.org
  0 siblings, 0 replies; 7+ messages in thread
From: andersen at uclibc.org @ 2007-01-11  7:25 UTC (permalink / raw)
  To: buildroot

Author: andersen
Date: 2007-01-10 23:25:29 -0800 (Wed, 10 Jan 2007)
New Revision: 17241

Log:
be explicit about not doing X


Modified:
   trunk/buildroot/package/jpeg/jpeg.mk


Changeset:
Modified: trunk/buildroot/package/jpeg/jpeg.mk
===================================================================
--- trunk/buildroot/package/jpeg/jpeg.mk	2007-01-11 07:25:01 UTC (rev 17240)
+++ trunk/buildroot/package/jpeg/jpeg.mk	2007-01-11 07:25:29 UTC (rev 17241)
@@ -46,6 +46,7 @@
 		--prefix=$(STAGING_DIR) \
 		--enable-shared \
 		--enable-static \
+		--without-x \
 	);
 	touch $(JPEG_DIR)/.configured
 

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] svn commit: trunk/buildroot/package/jpeg
@ 2006-09-19 14:56 jacmet at uclibc.org
  0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2006-09-19 14:56 UTC (permalink / raw)
  To: buildroot

Author: jacmet
Date: 2006-09-19 07:56:21 -0700 (Tue, 19 Sep 2006)
New Revision: 16157

Log:
Don't copy static lib to TARGET_DIR

Modified:
   trunk/buildroot/package/jpeg/jpeg.mk


Changeset:
Modified: trunk/buildroot/package/jpeg/jpeg.mk
===================================================================
--- trunk/buildroot/package/jpeg/jpeg.mk	2006-09-19 14:47:54 UTC (rev 16156)
+++ trunk/buildroot/package/jpeg/jpeg.mk	2006-09-19 14:56:21 UTC (rev 16157)
@@ -58,12 +58,12 @@
 	rm $(STAGING_DIR)/lib/libjpeg.la
 	touch -c $(STAGING_DIR)/lib/libjpeg.a
 
-$(TARGET_DIR)/usr/lib/libjpeg.a: $(STAGING_DIR)/lib/libjpeg.a
-	cp -dpf $(STAGING_DIR)/lib/libjpeg* $(TARGET_DIR)/usr/lib/
+$(TARGET_DIR)/usr/lib/libjpeg.so: $(STAGING_DIR)/lib/libjpeg.a
+	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/
 	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libjpeg.so*
-	touch -c $(TARGET_DIR)/usr/lib/libjpeg.a
+	touch -c $(TARGET_DIR)/usr/lib/libjpeg.so
 
-jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.a
+jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so
 
 jpeg-clean:
 	-$(MAKE) -C $(JPEG_DIR) clean

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-03-06 23:56 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-10-13 23:08 [Buildroot] svn commit: trunk/buildroot/package/jpeg ulf at uclibc.org
2007-10-13 23:52 ` Cristian Ionescu-Idbohrn
  -- strict thread matches above, loose matches on Subject: below --
2008-03-06 18:14 ninevoltz at uclibc.org
2008-03-06 23:56 ` Hamish Moffatt
2007-08-28 12:41 aldot at uclibc.org
2007-01-11  7:25 andersen at uclibc.org
2006-09-19 14:56 jacmet at uclibc.org

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.