* [Buildroot] svn commit: trunk/buildroot/package/cups
@ 2008-09-02 11:14 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-09-02 11:14 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-02 04:14:04 -0700 (Tue, 02 Sep 2008)
New Revision: 23304
Log:
cups: fix help text
Modified:
trunk/buildroot/package/cups/Config.in
Changeset:
Modified: trunk/buildroot/package/cups/Config.in
===================================================================
--- trunk/buildroot/package/cups/Config.in 2008-09-02 11:07:55 UTC (rev 23303)
+++ trunk/buildroot/package/cups/Config.in 2008-09-02 11:14:04 UTC (rev 23304)
@@ -1,6 +1,6 @@
config BR2_PACKAGE_CUPS
bool "cups"
help
- The Common Unix Print Subsystem
+ The Common Unix Printing System
http://www.cups.org
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cups
@ 2009-01-25 23:16 ulf at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ulf at uclibc.org @ 2009-01-25 23:16 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-25 23:16:11 +0000 (Sun, 25 Jan 2009)
New Revision: 25029
Log:
exec-profix fix for cups
Modified:
trunk/buildroot/package/cups/cups.mk
Changeset:
Modified: trunk/buildroot/package/cups/cups.mk
===================================================================
--- trunk/buildroot/package/cups/cups.mk 2009-01-25 23:14:55 UTC (rev 25028)
+++ trunk/buildroot/package/cups/cups.mk 2009-01-25 23:16:11 UTC (rev 25029)
@@ -78,18 +78,10 @@
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
- --includedir=/usr/include \
- --libdir=/usr/lib \
- --exec-prefix=/ \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
+ --exec-prefix=/usr \
--sysconfdir=/etc \
- --with-config-file-path=/etc \
- --datadir=/usr/share/misc \
--localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
+ --with-config-file-path=/etc \
--disable-gnutls \
--disable-gssapi \
$(CUPS_CONF_OPT) \
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cups
@ 2009-01-25 20:53 ulf at uclibc.org
2009-01-25 21:06 ` Peter Korsgaard
0 siblings, 1 reply; 7+ messages in thread
From: ulf at uclibc.org @ 2009-01-25 20:53 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-25 20:53:43 +0000 (Sun, 25 Jan 2009)
New Revision: 25020
Log:
Make cups build, support perl/php option
Modified:
trunk/buildroot/package/cups/cups.mk
Changeset:
Modified: trunk/buildroot/package/cups/cups.mk
===================================================================
--- trunk/buildroot/package/cups/cups.mk 2009-01-25 20:50:59 UTC (rev 25019)
+++ trunk/buildroot/package/cups/cups.mk 2009-01-25 20:53:43 UTC (rev 25020)
@@ -3,25 +3,61 @@
# cups
#
################################################################################
-CUPS_VERSION = 1.3.5
+CUPS_VERSION = 1.3.9
CUPS_NAME = cups-$(CUPS_VERSION)
CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
-CUPS_SITE = http://ftp.easysw.com/pub/cups/1.3.5
+CUPS_SITE = http://ftp.easysw.com/pub/cups/$(CUPS_VERSION)
CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib
CUPS_CAT:=$(BZCAT)
ifeq ($(BR2_PACKAGE_DBUS),y)
- CUPS_CONF_OPT_DBUS =--enable-dbus
- CUPS_DEPENDENCIES_DBUS = dbus
+ CUPS_CONF_OPT += --enable-dbus
+ CUPS_DEPENDENCIES += dbus
else
- CUPS_CONF_OPT_DBUS =--disable-dbus
+ CUPS_CONF_OPT += --disable-dbus
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
- CUPS_DEPENDENCIES_X = xlib_libX11
+ CUPS_DEPENDENCIES += xlib_libX11
endif
+CUPS_CONF_OPT += --disable-perl
+CUPS_CONF_OPT += --disable-java
+CUPS_CFLAGS = $(TARGET_CFLAGS)
+
+
+ifeq ($(BR2_PACKAGE_PERL),disabled) # We do not provide perl (yet)
+ CUPS_CONF_ENV += ac_cv_path_perl=$(STAGING_DIR)/usr/bin/perl
+ CUPS_CONF_OPT += --with-perl
+ CUPS_DEPENDENCIES += microperl
+else
+ CUPS_CONF_OPT += --disable-perl
+endif
+
+ifeq ($(BR2_PACKAGE_PHP),y)
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/main
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/regex
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/TSRM
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/Zend
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/php/ext
+ CUPS_CONF_ENV += ac_cv_path_php=$(STAGING_DIR)/usr/bin/php
+ CUPS_CONF_OPT += --with-php
+ CUPS_DEPENDENCIES += php
+else
+ CUPS_CONF_OPT += --disable-php
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+ CUPS_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+ CUPS_CONF_ENV += ac_cv_path_python=$(STAGING_DIR)/usr/bin/python
+ CUPS_CONF_OPT += --with-python
+ CUPS_DEPENDENCIES += python
+else
+ CUPS_CONF_OPT += --disable-python
+endif
+
$(DL_DIR)/$(CUPS_SOURCE):
$(call DOWNLOAD,$(CUPS_SITE),$(CUPS_SOURCE))
@@ -35,13 +71,33 @@
(cd $(CUPS_DIR) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
+ $(CUPS_CONF_ENV) \
+ CFLAGS="$(CUPS_CFLAGS)" \
./configure \
- --prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include \
- --libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
+ --target=$(GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --prefix=/usr \
+ --includedir=/usr/include \
+ --libdir=/usr/lib \
+ --exec-prefix=/ \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --with-config-file-path=/etc \
+ --datadir=/usr/share/misc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --disable-gnutls \
+ --disable-gssapi \
+ $(CUPS_CONF_OPT) \
+ )
touch $@
$(CUPS_DIR)/.compiled: $(CUPS_DIR)/.configured
- $(MAKE) -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
+ $(MAKE) CFLAGS="$(CUPS_CFLAGS)" -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
locale monitor notifier pdftops scheduler systemv scripting/php \
conf data doc fonts ppd templates
touch $@
@@ -55,11 +111,14 @@
$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
touch $@
-cups: uclibc $(CUPS_DEPENDENCIES_DBUS) $(CUPS_DEPENDENCIES_X) $(CUPS_DIR)/.installed
+cups: uclibc $(CUPS_DEPENDENCIES) $(CUPS_DIR)/.installed
cups-clean:
-$(MAKE) -C $(CUPS_DIR) clean
+cups-dirclean:
+ rm -fr $(CUPS_DIR)
+
#############################################################
#
# Toplevel Makefile options
@@ -67,4 +126,5 @@
#############################################################
ifeq ($(BR2_PACKAGE_CUPS),y)
TARGETS+=cups
-endif
\ No newline at end of file
+endif
+
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cups
2009-01-25 20:53 ulf at uclibc.org
@ 2009-01-25 21:06 ` Peter Korsgaard
2009-01-25 22:49 ` Ulf Samuelsson
0 siblings, 1 reply; 7+ messages in thread
From: Peter Korsgaard @ 2009-01-25 21:06 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-25 20:53:43 +0000 (Sun, 25 Jan 2009)
ulf> New Revision: 25020
ulf> Log:
ulf> Make cups build, support perl/php option
ulf> Modified:
ulf> trunk/buildroot/package/cups/cups.mk
ulf> (cd $(CUPS_DIR) && \
ulf> $(TARGET_CONFIGURE_OPTS) \
ulf> $(TARGET_CONFIGURE_ARGS) \
ulf> + $(CUPS_CONF_ENV) \
ulf> + CFLAGS="$(CUPS_CFLAGS)" \
ulf> ./configure \
ulf> - --prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include \
ulf> - --libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
ulf> + --target=$(GNU_TARGET_NAME) \
ulf> + --host=$(GNU_TARGET_NAME) \
ulf> + --build=$(GNU_HOST_NAME) \
ulf> + --prefix=/usr \
ulf> + --includedir=/usr/include \
ulf> + --libdir=/usr/lib \
ulf> + --exec-prefix=/ \
Shouldn't that be /usr?
ulf> + --bindir=/usr/bin \
ulf> + --sbindir=/usr/sbin \
ulf> + --libexecdir=/usr/lib \
ulf> + --sysconfdir=/etc \
And all of those should get set automatically by prefix.
ulf> + --with-config-file-path=/etc \
ulf> + --datadir=/usr/share/misc \
ulf> + --localstatedir=/var \
ulf> + --mandir=/usr/man \
ulf> + --infodir=/usr/info \
ulf> + --disable-gnutls \
ulf> + --disable-gssapi \
ulf> + $(CUPS_CONF_OPT) \
ulf> + )
ulf> touch $@
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cups
2009-01-25 21:06 ` Peter Korsgaard
@ 2009-01-25 22:49 ` Ulf Samuelsson
0 siblings, 0 replies; 7+ messages in thread
From: Ulf Samuelsson @ 2009-01-25 22:49 UTC (permalink / raw)
To: buildroot
s?n 2009-01-25 klockan 22:06 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf <ulf@uclibc.org> writes:
>
> ulf> Author: ulf
> ulf> Date: 2009-01-25 20:53:43 +0000 (Sun, 25 Jan 2009)
> ulf> New Revision: 25020
>
> ulf> Log:
> ulf> Make cups build, support perl/php option
>
> ulf> Modified:
> ulf> trunk/buildroot/package/cups/cups.mk
>
>
> ulf> (cd $(CUPS_DIR) && \
> ulf> $(TARGET_CONFIGURE_OPTS) \
> ulf> $(TARGET_CONFIGURE_ARGS) \
> ulf> + $(CUPS_CONF_ENV) \
> ulf> + CFLAGS="$(CUPS_CFLAGS)" \
> ulf> ./configure \
> ulf> - --prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include \
> ulf> - --libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
> ulf> + --target=$(GNU_TARGET_NAME) \
> ulf> + --host=$(GNU_TARGET_NAME) \
> ulf> + --build=$(GNU_HOST_NAME) \
> ulf> + --prefix=/usr \
> ulf> + --includedir=/usr/include \
> ulf> + --libdir=/usr/lib \
> ulf> + --exec-prefix=/ \
>
> Shouldn't that be /usr?
>
True, the config was all screwed, so I copied from
another location.
A grep shows other packages with problems.
bootutils/bootutils.mk:BOOTUTILS_CONF_OPT = --prefix=/ --exec-prefix=/
cups/cups.mk: --exec-prefix=/ \
gzip/gzip.mk: --exec-prefix=/ \
libeXosip2/libeXosip2.mk: --exec-prefix=/ \
php/php.mk: --exec-prefix=/ \
xfsprogs/xfsprogs.mk: --exec-prefix=/ \
xfsprogs/xfsprogs.mk: exec-prefix=/ \
> ulf> + --bindir=/usr/bin \
> ulf> + --sbindir=/usr/sbin \
> ulf> + --libexecdir=/usr/lib \
> ulf> + --sysconfdir=/etc \
>
> And all of those should get set automatically by prefix.
>
> ulf> + --with-config-file-path=/etc \
> ulf> + --datadir=/usr/share/misc \
> ulf> + --localstatedir=/var \
> ulf> + --mandir=/usr/man \
> ulf> + --infodir=/usr/info \
> ulf> + --disable-gnutls \
> ulf> + --disable-gssapi \
> ulf> + $(CUPS_CONF_OPT) \
> ulf> + )
> ulf> touch $@
>
>
BR
Ulf Samuelsson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: exec-prefix.patch
Type: text/x-patch
Size: 2727 bytes
Desc: not available
Url : http://lists.busybox.net/pipermail/buildroot/attachments/20090125/d7a6f5d7/attachment-0001.bin
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cups
@ 2008-09-01 21:16 jacmet at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: jacmet at uclibc.org @ 2008-09-01 21:16 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2008-09-01 14:16:35 -0700 (Mon, 01 Sep 2008)
New Revision: 23299
Log:
cups: fix help text
Modified:
trunk/buildroot/package/cups/Config.in
Changeset:
Modified: trunk/buildroot/package/cups/Config.in
===================================================================
--- trunk/buildroot/package/cups/Config.in 2008-09-01 15:33:17 UTC (rev 23298)
+++ trunk/buildroot/package/cups/Config.in 2008-09-01 21:16:35 UTC (rev 23299)
@@ -1,7 +1,6 @@
config BR2_PACKAGE_CUPS
bool "cups"
help
- The Common Unix Print Subsystem
+ The Common Unix Print Subsystem
- http://www.cups.org
-
+ http://www.cups.org
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/cups
@ 2008-04-25 16:45 ninevoltz at uclibc.org
0 siblings, 0 replies; 7+ messages in thread
From: ninevoltz at uclibc.org @ 2008-04-25 16:45 UTC (permalink / raw)
To: buildroot
Author: ninevoltz
Date: 2008-04-25 09:45:27 -0700 (Fri, 25 Apr 2008)
New Revision: 21860
Log:
Change cups makefile to fix $(STAGING_DIR)/usr/bin/cups-config
Modified:
trunk/buildroot/package/cups/cups.mk
Changeset:
Modified: trunk/buildroot/package/cups/cups.mk
===================================================================
--- trunk/buildroot/package/cups/cups.mk 2008-04-25 13:43:00 UTC (rev 21859)
+++ trunk/buildroot/package/cups/cups.mk 2008-04-25 16:45:27 UTC (rev 21860)
@@ -3,30 +3,68 @@
# cups
#
################################################################################
-
CUPS_VERSION = 1.3.5
-CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
+CUPS_NAME = cups-$(CUPS_VERSION)
+CUPS_DIR = $(BUILD_DIR)/$(CUPS_NAME)
CUPS_SITE = http://ftp.easysw.com/pub/cups/1.3.5
-CUPS_AUTORECONF = NO
-CUPS_INSTALL_STAGING = YES
-CUPS_INSTALL_TARGET = YES
-CUPS_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install DSTROOT=$(STAGING_DIR)
-CUPS_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install DSTROOT=$(TARGET_DIR)
+CUPS_SOURCE:=$(CUPS_NAME)-source.tar.bz2
+CUPS_DESTDIR:=$(STAGING_DIR)/usr/lib
+CUPS_CAT:=$(BZCAT)
ifeq ($(BR2_PACKAGE_DBUS),y)
- CUPS_CONF_OPT_DBUS =--disable-dbus
+ CUPS_CONF_OPT_DBUS =--enable-dbus
CUPS_DEPENDENCIES_DBUS = dbus
else
- CUPS_CONF_OPT_DBUS =--enable-dbus
+ CUPS_CONF_OPT_DBUS =--disable-dbus
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
CUPS_DEPENDENCIES_X = xlib_libX11
endif
-CUPS_CONF_OPT = --prefix=/usr --includedir=/usr/include --libdir=/usr/lib --disable-gnutls --disable-gssapi $(CUPS_CONF_OPT_DBUS)
-CUPS_MAKE_OPT = cups backend berkeley cgi-bin filter locale monitor notifier pdftops scheduler systemv scripting/php conf data doc fonts ppd templates
+$(DL_DIR)/$(CUPS_SOURCE):
+ $(WGET) -P $(DL_DIR) $(CUPS_SITE)/$(CUPS_SOURCE)
-CUPS_DEPENDENCIES = $(CUPS_DEPENDENCIES_DBUS) $(CUPS_DEPENDENCIES_X)
+$(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
+ $(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(CUPS_DIR) package/cups/ \*.patch
+ $(CONFIG_UPDATE) $(CUPS_DIR)
+ touch $@
-$(eval $(call AUTOTARGETS,package,cups))
+$(CUPS_DIR)/.configured: $(CUPS_DIR)/.unpacked
+ (cd $(CUPS_DIR) && \
+ $(TARGET_CONFIGURE_OPTS) \
+ $(TARGET_CONFIGURE_ARGS) \
+ ./configure \
+ --prefix=/usr $(CUPS_CONF_OPT_DBUS) --includedir=/usr/include \
+ --libdir=/usr/lib --disable-gnutls --disable-gssapi --host=$(ARCH) \ )
+ touch $@
+
+$(CUPS_DIR)/.compiled: $(CUPS_DIR)/.configured
+ $(MAKE) -C $(CUPS_DIR) cups backend berkeley cgi-bin filter \
+ locale monitor notifier pdftops scheduler systemv scripting/php \
+ conf data doc fonts ppd templates
+ touch $@
+
+$(CUPS_DIR)/.installed: $(CUPS_DIR)/.compiled
+ $(MAKE) -C $(CUPS_DIR) DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
+ $(MAKE) -C $(CUPS_DIR) DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
+ $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/cups-config
+ $(SED) "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/cups-config
+ $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" $(STAGING_DIR)/usr/bin/cups-config
+ $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/bin/cups-config
+ touch $@
+
+cups: uclibc $(CUPS_DEPENDENCIES_DBUS) $(CUPS_DEPENDENCIES_X) $(CUPS_DIR)/.installed
+
+cups-clean:
+ -$(MAKE) -C $(CUPS_DIR) clean
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_CUPS)),y)
+TARGETS+=cups
+endif
\ No newline at end of file
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-01-25 23:16 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-02 11:14 [Buildroot] svn commit: trunk/buildroot/package/cups jacmet at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2009-01-25 23:16 ulf at uclibc.org
2009-01-25 20:53 ulf at uclibc.org
2009-01-25 21:06 ` Peter Korsgaard
2009-01-25 22:49 ` Ulf Samuelsson
2008-09-01 21:16 jacmet at uclibc.org
2008-04-25 16:45 ninevoltz 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