Skip to content

Commit

Permalink
gettext: remove package
Browse files Browse the repository at this point in the history 
This package was necessary when uClibc was in the tree. Now that uClibc
is gone, this can go too.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information
@neheb @hauke
neheb authored and hauke committed Nov 20, 2021
1 parent 48774de commit e6f5694
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 1,406 deletions.
4 changes: 2 additions & 2 deletions include/autotools.mk
View file
Expand Up @@ -113,7 +113,7 @@ ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
endif

ifneq ($(filter libtool,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool gettext libiconv
PKG_BUILD_DEPENDS += libtool libiconv
ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
Hooks/Configure/Pre += autoreconf_target
endif
Expand All @@ -124,7 +124,7 @@ ifneq ($(filter libtool-abiver,$(PKG_FIXUP)),)
endif

ifneq ($(filter libtool-ucxx,$(PKG_FIXUP)),)
PKG_BUILD_DEPENDS += libtool gettext libiconv
PKG_BUILD_DEPENDS += libtool libiconv
ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),)
Hooks/Configure/Pre += autoreconf_target
endif
Expand Down
2 changes: 1 addition & 1 deletion include/nls.mk
View file
Expand Up @@ -20,7 +20,7 @@ else
endif

PKG_CONFIG_DEPENDS += CONFIG_BUILD_NLS
PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv !BUILD_NLS:gettext
PKG_BUILD_DEPENDS += !BUILD_NLS:libiconv

ICONV_DEPENDS:=+BUILD_NLS:libiconv-full
ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
Expand Down
63 changes: 0 additions & 63 deletions package/libs/gettext/Makefile
View file

This file was deleted.

7 changes: 0 additions & 7 deletions package/libs/gettext/src/LICENSE
View file

This file was deleted.

53 changes: 0 additions & 53 deletions package/libs/gettext/src/include/libintl.h
View file

This file was deleted.

21 changes: 0 additions & 21 deletions package/libs/gettext/src/m4/codeset.m4
View file

This file was deleted.

4 comments on commit e6f5694

@Entropy512
Copy link

@Entropy512 Entropy512 commented on e6f5694 Nov 22, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It appears that minicom does not like this change, any suggestions on how to update the minicom package to handle this?

./configure: line 6690: syntax error near unexpected token `external'
./configure: line 6690: `AM_GNU_GETTEXT(external)'

Edit: Workaround for now is to manually set CONFIG_BUILD_NLS - will figure out a better solution later. Not sure if setting that as a dependency for minicom is acceptable or if there is a better solution for this package. LIBINTL dependencies seem to run deep in minicom vs. other packages where OpenWRT disables gettext dependencies with patches (such as acl or attr)

@hauke
Copy link
Member

@hauke hauke commented on e6f5694 Nov 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@neheb Can you help here?

@neheb
Copy link
Contributor Author

@neheb neheb commented on e6f5694 Nov 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds weird. Maybe needs gettext-full/host.

I'll see if the buildbots complain.

@ptpt52
Copy link
Contributor

@ptpt52 ptpt52 commented on e6f5694 Nov 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same issue on my buildbots
openwrt/packages#17208

Please sign in to comment.