Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Feb 2014 12:33:13 +0200
From:      Alexander Panyushkin <vsityz@gmail.com>
To:        Tijl Coosemans <tijl@FreeBSD.org>
Cc:        stable@freebsd.org
Subject:   Re: converters/php55-iconv in FreeBSD 10
Message-ID:  <5301E569.60104@gmail.com>
In-Reply-To: <20140217110104.48297f5c@kalimero.tijl.coosemans.org>
References:  <52FE26FC.3070708@gmail.com>	<20140214160455.26d39e9d@kalimero.tijl.coosemans.org>	<53011CA2.2020205@gmail.com>	<20140216230658.23403034@kalimero.tijl.coosemans.org>	<5301D731.30308@gmail.com> <20140217110104.48297f5c@kalimero.tijl.coosemans.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 17.02.2014 12:01, Tijl Coosemans wrote:
>>> >>Do you have any local modifications in /usr/src?
>>> >>Do you build with -DNO_CLEAN maybe?  What if you build without that?
>> >I build worl with...
>> ># cd/usr/src &&  rm -rf ../obj/* && make cleandir; make cleandir; time
>> >(make buildworld && make kernel) | tee -a /tmp/world_kernel.log
> Well for some reason installworld isn't installing fcntl.h correctly.
> Try the following:
>
> mv /usr/include /usr/include~
> mkdir /usr/include
> cd /usr/src/include
> make install
> cd /usr/src
> make installincludes
>
> Then you can check for differences with:
>
> diff -urN /usr/include~ /usr/include

I deleted from /etc/ src.conf

WITH_LIBICONV_COMPAT=YES


# diff -urN /usr/include~ /usr/include
diff -urN /usr/include~/fcntl.h /usr/include/fcntl.h
--- /usr/include~/fcntl.h    2014-02-15 16:03:43.864492439 +0200
+++ /usr/include/fcntl.h    2014-02-17 12:24:57.198039431 +0200
@@ -32,7 +32,7 @@
   * SUCH DAMAGE.
   *
   *    @(#)fcntl.h    8.3 (Berkeley) 1/21/94
- * $FreeBSD: head/sys/sys/fcntl.h 254888 2013-08-25 21:52:04Z jilles $
+ * $FreeBSD: stable/10/sys/sys/fcntl.h 254888 2013-08-25 21:52:04Z jilles $
   */

  #ifndef _SYS_FCNTL_H_
diff -urN /usr/include~/net80211/ieee80211.h 
/usr/include/net80211/ieee80211.h
--- /usr/include~/net80211/ieee80211.h    2014-02-15 16:03:42.666819839 
+0200
+++ /usr/include/net80211/ieee80211.h    2014-02-17 12:24:56.938039711 +0200
@@ -23,7 +23,7 @@
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   *
- * $FreeBSD: head/sys/net80211/ieee80211.h 253639 2013-07-25 06:23:26Z 
rpaulo $
+ * $FreeBSD: stable/10/sys/net80211/ieee80211.h 262007 2014-02-17 
01:36:53Z kevlo $
   */
  #ifndef _NET80211_IEEE80211_H_
  #define _NET80211_IEEE80211_H_
@@ -166,7 +166,7 @@
  #define    IEEE80211_FC1_RETRY            0x08
  #define    IEEE80211_FC1_PWR_MGT            0x10
  #define    IEEE80211_FC1_MORE_DATA            0x20
-#define    IEEE80211_FC1_WEP            0x40
+#define    IEEE80211_FC1_PROTECTED            0x40
  #define    IEEE80211_FC1_ORDER            0x80

  #define    IEEE80211_SEQ_FRAG_MASK            0x000f
diff -urN /usr/include~/sys/fcntl.h /usr/include/sys/fcntl.h
--- /usr/include~/sys/fcntl.h    2014-02-15 16:03:43.864492439 +0200
+++ /usr/include/sys/fcntl.h    2014-02-17 12:24:57.198039431 +0200
@@ -32,7 +32,7 @@
   * SUCH DAMAGE.
   *
   *    @(#)fcntl.h    8.3 (Berkeley) 1/21/94
- * $FreeBSD: head/sys/sys/fcntl.h 254888 2013-08-25 21:52:04Z jilles $
+ * $FreeBSD: stable/10/sys/sys/fcntl.h 254888 2013-08-25 21:52:04Z jilles $
   */

  #ifndef _SYS_FCNTL_H_


-- 
Alexander




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5301E569.60104>