* [Buildroot] svn commit: trunk/buildroot/package/libogg
@ 2007-11-29 9:42 ulf at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2007-11-29 9:42 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-29 01:42:06 -0800 (Thu, 29 Nov 2007)
New Revision: 20578
Log:
Ensure ogg lib is in staging dir
Modified:
trunk/buildroot/package/libogg/libogg.mk
Changeset:
Modified: trunk/buildroot/package/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/libogg/libogg.mk 2007-11-29 08:17:45 UTC (rev 20577)
+++ trunk/buildroot/package/libogg/libogg.mk 2007-11-29 09:42:06 UTC (rev 20578)
@@ -41,11 +41,16 @@
touch $@
$(LIBOGG_DIR)/.libs: $(LIBOGG_DIR)/.configured
- $(MAKE) CC=$(TARGET_CC) -C $(LIBOGG_DIR)
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(LIBOGG_DIR)
touch $@
-$(TARGET_DIR)/usr/lib/libogg.so: $(LIBOGG_DIR)/.libs
- $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBOGG_DIR) install
+$(STAGING_DIR)/usr/lib/libogg.so: $(LIBOGG_DIR)/.libs
+ mkdir -p $(STAGING_DIR)
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBOGG_DIR) install
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libogg.la
+
+$(TARGET_DIR)/usr/lib/libogg.so: $(STAGING_DIR)/usr/lib/libogg.so
+ cp -dpf $(STAGING_DIR)/usr/lib/libogg.so* $(TARGET_DIR)/usr/lib
ifneq ($(strip $(BR2_HAVE_MANPAGES)),y)
rm -rf $(TARGET_DIR)/usr/share/doc/$(LIBOGG_NAME)
endif
@@ -65,7 +70,8 @@
libogg-source: $(DL_DIR)/$(LIBOGG_SOURCE)
libogg-clean:
- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBOGG_DIR) uninstall
+ -rm -rf $(TARGET_DIR)/usr/lib/libogg.so*
+ $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBOGG_DIR) uninstall
-$(MAKE) -C $(LIBOGG_DIR) clean
libogg-dirclean:
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libogg
@ 2007-11-30 12:34 ulf at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2007-11-30 12:34 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-11-30 04:34:54 -0800 (Fri, 30 Nov 2007)
New Revision: 20598
Log:
Strip libogg, when copied to root fs
Modified:
trunk/buildroot/package/libogg/libogg.mk
Changeset:
Modified: trunk/buildroot/package/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/libogg/libogg.mk 2007-11-30 12:33:37 UTC (rev 20597)
+++ trunk/buildroot/package/libogg/libogg.mk 2007-11-30 12:34:54 UTC (rev 20598)
@@ -51,6 +51,7 @@
$(TARGET_DIR)/usr/lib/libogg.so: $(STAGING_DIR)/usr/lib/libogg.so
cp -dpf $(STAGING_DIR)/usr/lib/libogg.so* $(TARGET_DIR)/usr/lib
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libogg.so*
ifneq ($(strip $(BR2_HAVE_MANPAGES)),y)
rm -rf $(TARGET_DIR)/usr/share/doc/$(LIBOGG_NAME)
endif
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libogg
@ 2008-06-16 11:16 jacmet at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:16 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:16:10 -0700 (Mon, 16 Jun 2008)
New Revision: 22370
Log:
libogg: fix libogg.a target
Based on patch by Conrad Parker.
Modified:
trunk/buildroot/package/libogg/libogg.mk
Changeset:
Modified: trunk/buildroot/package/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/libogg/libogg.mk 2008-06-16 11:15:51 UTC (rev 22369)
+++ trunk/buildroot/package/libogg/libogg.mk 2008-06-16 11:16:10 UTC (rev 22370)
@@ -55,11 +55,9 @@
ifneq ($(strip $(BR2_HAVE_MANPAGES)),y)
rm -rf $(TARGET_DIR)/usr/share/doc/$(LIBOGG_NAME)
endif
- touch $@
$(TARGET_DIR)/usr/lib/libogg.a: $(TARGET_DIR)/usr/lib/libogg.so
- cp -dpf $(LIBOGG_DIR)/lib/libogg.a $(TARGET_DIR)/usr/lib/
- touch $@
+ cp -dpf $(STAGING_DIR)/usr/lib/libogg.a $@
libogg-header: $(TARGET_DIR)/usr/lib/libogg.a
mkdir -p $(TARGET_DIR)/usr/include/ogg
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libogg
@ 2008-06-16 11:16 jacmet at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:16 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:16:28 -0700 (Mon, 16 Jun 2008)
New Revision: 22371
Log:
libogg: move header install to seperate target so it isn't always out-of-date
Modified:
trunk/buildroot/package/libogg/libogg.mk
Changeset:
Modified: trunk/buildroot/package/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/libogg/libogg.mk 2008-06-16 11:16:10 UTC (rev 22370)
+++ trunk/buildroot/package/libogg/libogg.mk 2008-06-16 11:16:28 UTC (rev 22371)
@@ -56,14 +56,16 @@
rm -rf $(TARGET_DIR)/usr/share/doc/$(LIBOGG_NAME)
endif
-$(TARGET_DIR)/usr/lib/libogg.a: $(TARGET_DIR)/usr/lib/libogg.so
+$(TARGET_DIR)/usr/lib/libogg.a: $(STAGING_DIR)/usr/lib/libogg.so
cp -dpf $(STAGING_DIR)/usr/lib/libogg.a $@
-libogg-header: $(TARGET_DIR)/usr/lib/libogg.a
+$(TARGET_DIR)/usr/include/ogg/ogg.h: $(STAGING_DIR)/usr/lib/libogg.so
mkdir -p $(TARGET_DIR)/usr/include/ogg
cp -dpf $(LIBOGG_DIR)/include/ogg/*.h \
$(TARGET_DIR)/usr/include/ogg
+libogg-header: $(TARGET_DIR)/usr/lib/libogg.a $(TARGET_DIR)/usr/include/ogg/ogg.h
+
libogg: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libogg.so
libogg-source: $(DL_DIR)/$(LIBOGG_SOURCE)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/libogg
@ 2008-06-16 11:25 jacmet at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: jacmet at uclibc.org @ 2008-06-16 11:25 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-06-16 04:25:25 -0700 (Mon, 16 Jun 2008)
New Revision: 22372
Log:
libogg: remove BR2_PACKAGE_LIBOGG_HEADERS
We don't need per-package header install options now that we have
BR2_HAVE_DEVFILES (they are in fact useless as the files will get
overwritten/deleted anyway).
Modified:
trunk/buildroot/package/libogg/Config.in
trunk/buildroot/package/libogg/libogg.mk
Changeset:
Modified: trunk/buildroot/package/libogg/Config.in
===================================================================
--- trunk/buildroot/package/libogg/Config.in 2008-06-16 11:16:28 UTC (rev 22371)
+++ trunk/buildroot/package/libogg/Config.in 2008-06-16 11:25:25 UTC (rev 22372)
@@ -3,12 +3,5 @@
default n
select BR2_PACKAGE_PKGCONFIG
help
- Ogg is the name of Xiph.org's container format for audio, video, and metadata
-
-config BR2_PACKAGE_LIBOGG_HEADERS
- bool "libogg target headers"
- default n
- depends on BR2_PACKAGE_LIBOGG
- help
- Add target headers for the Ogg open source container format
- - Not yet implemented
+ Ogg is the name of Xiph.org's container format for audio,
+ video, and metadata
Modified: trunk/buildroot/package/libogg/libogg.mk
===================================================================
--- trunk/buildroot/package/libogg/libogg.mk 2008-06-16 11:16:28 UTC (rev 22371)
+++ trunk/buildroot/package/libogg/libogg.mk 2008-06-16 11:25:25 UTC (rev 22372)
@@ -56,16 +56,6 @@
rm -rf $(TARGET_DIR)/usr/share/doc/$(LIBOGG_NAME)
endif
-$(TARGET_DIR)/usr/lib/libogg.a: $(STAGING_DIR)/usr/lib/libogg.so
- cp -dpf $(STAGING_DIR)/usr/lib/libogg.a $@
-
-$(TARGET_DIR)/usr/include/ogg/ogg.h: $(STAGING_DIR)/usr/lib/libogg.so
- mkdir -p $(TARGET_DIR)/usr/include/ogg
- cp -dpf $(LIBOGG_DIR)/include/ogg/*.h \
- $(TARGET_DIR)/usr/include/ogg
-
-libogg-header: $(TARGET_DIR)/usr/lib/libogg.a $(TARGET_DIR)/usr/include/ogg/ogg.h
-
libogg: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libogg.so
libogg-source: $(DL_DIR)/$(LIBOGG_SOURCE)
@@ -86,7 +76,3 @@
ifeq ($(strip $(BR2_PACKAGE_LIBOGG)),y)
TARGETS+=libogg
endif
-
-ifeq ($(strip $(BR2_PACKAGE_LIBOGG_HEADERS)),y)
-TARGETS+=libogg-header
-endif
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-06-16 11:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-16 11:25 [Buildroot] svn commit: trunk/buildroot/package/libogg jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-06-16 11:16 jacmet at uclibc.org
2008-06-16 11:16 jacmet at uclibc.org
2007-11-30 12:34 ulf at uclibc.org
2007-11-29 9:42 ulf at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox