Commit ebf47824 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

readline: remove BR2_PACKAGE_READLINE_TARGET configuration option 

Other packages don't have this, and several packages are depending on
readline where they actually want readline-target instead.
parent 7eec8ea5

package/database/sqlite/sqlite.mk

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ $(TARGET_DIR)/usr/bin/sqlite3: $(STAGING_DIR)/usr/bin/sqlite3 
	cp -dpf $(STAGING_DIR)/usr/lib/libsqlite3*.so* $(TARGET_DIR)/usr/lib/

	$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libsqlite3.so



sqlite: uclibc readline-target ncurses $(TARGET_DIR)/usr/bin/sqlite3

sqlite: uclibc ncurses $(TARGET_DIR)/usr/bin/sqlite3



sqlite-source: $(DL_DIR)/$(SQLITE_SOURCE)

package/python/python.mk

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ PYTHON_SITE_PACKAGE_DIR=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site 
BR2_PYTHON_DISABLED_MODULES=dbm zipfile



ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)

PYTHON_DEPS += readline-target

PYTHON_DEPS += readline

else

BR2_PYTHON_DISABLED_MODULES += readline

endif

package/readline/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -3,9 +3,3 @@ config BR2_READLINE 
	bool "readline"

	help

	    Enable GNU readline support?
 


config BR2_PACKAGE_READLINE_TARGET

	bool "readline for the target"

	depends on BR2_READLINE

	help

	  Say yes here to install the readline libraries on the target.

package/readline/readline.mk

+3 −10
Original line number Diff line number Diff line
@@ -76,23 +76,16 @@ $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY): $(READLINE_DIR)/$(READLINE_BINAR 
	chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)

	$(STRIPCMD) $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION)



readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h

readline: ncurses $(STAGING_DIR)/usr/include/readline/readline.h $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)



readline-clean:

	$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall

	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(STAGING_DIR) uninstall

	-$(MAKE) -C $(READLINE_DIR) DESTDIR=$(TARGET_DIR) uninstall

	-$(MAKE) -C $(READLINE_DIR) clean



readline-dirclean:

	rm -rf $(READLINE_DIR)



readline-target: readline $(TARGET_DIR)/$(READLINE_TARGET_SHARED_BINARY)



readline-target-clean:

	-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(READLINE_DIR) uninstall



ifeq ($(BR2_READLINE),y)

TARGETS+=readline

endif
 
ifeq ($(BR2_PACKAGE_READLINE_TARGET),y)

TARGETS+=readline-target

endif