Re: Gnu Elpa broken

[Stefan Monnier]

> seems GNU ELPA is broken since some days due to ebdb for me: "make"

GNU ELPA (i.e. the archive distribution) is OK, but indeed the elpa.git
checkout can't be directly built without error unless you have helm and
pyim installed.

I use the patch below locally for now.
Haven't yet tried to push this to Eric.


        Stefan


--- a/packages/ebdb-i18n-chn/ebdb-i18n-chn.el
+++ b/packages/ebdb-i18n-chn/ebdb-i18n-chn.el
@@ -1,4 +1,4 @@
-;;; ebdb-chn.el --- China-specific internationalization support for EBDB  -*- 
lexical-binding: t; -*-
+;;; ebdb-i18n-chn.el --- China-specific internationalization support for EBDB  
-*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2016-2017  Free Software Foundation, Inc.
 
@@ -33,7 +33,7 @@
 
 ;;; Code:
 
-(require 'pyim)
+(when t (require 'pyim))                ;Don't require during compile-time.
 (require 'ebdb-i18n)
 
 (cl-defmethod ebdb-string-i18n ((phone ebdb-field-phone)
diff --git a/packages/helm-ebdb/helm-ebdb.el b/packages/helm-ebdb/helm-ebdb.el
index 63fda85f9..b160ca9e8 100644
--- a/packages/helm-ebdb/helm-ebdb.el
+++ b/packages/helm-ebdb/helm-ebdb.el
@@ -27,8 +27,8 @@
 
 ;;; Code:
 
-(require 'ebdb)
-(require 'helm)
+(require 'ebdb-com)
+(when t (require 'helm))                ;Don't require during compile-time.
 
 (declare-function ebdb-display-records "ext:ebdb-com"
                  (records &optional fmt append select pop buf))